replace term "Glossary" by "Nomenclature"

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

diff --git a/ANNOUNCE b/ANNOUNCE
index b1a6a1cf09ac661ebd1b171d643e259b80ee5794..e5f1177b609103d24f1d21ca5db4250719bee6e6 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -142,7 +142,7 @@ LaTeX. support for the booktabs package was implemented, which
 provides beautiful and elegant tabulars.
  
 
-* Glossaries
+* Nomenclatures
 
 Native LyX support for the nomencl package was implemented. With this,
 you can treat your document with all sorts of nomenclatures,

diff --git a/NEWS b/NEWS
index bca9e82a6c13a02846345323b8f05ad18bf84b3f..c75c8bb53f655e09a5ac3cc279786cf18d99837c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -77,7 +77,7 @@ LaTeX. support for the booktabs package was implemented, which
 provides beautiful and elegant tabulars.
  
 
-* Glossaries
+* Nomenclatures
 
 Native LyX support for the nomencl package was implemented. With this,
 you can treat your document with all sorts of nomenclatures,

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt b/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
index 6537cc9ea80dbe695716889b8a031f3f9ae3ff36..be4881d44b0b074528118776ba6790bfac78531e 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
@@ -40,7 +40,7 @@ Version LyX 1.5svn-09-04-2007
   - new layout and template files for the g-brief2 letter class and the
     moderncv and europecv curriculum vitae classes
   - reworked BibTeX file parser
-  - reworked graphics, glossary, and  math delimiter dialog
+  - reworked graphics, nomenclature, and math delimiter dialog
   - new Spanish translation of the Extended manual
   - many other bugfixes
 

diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in
index 275f5d91030cbb8acc71f8c5f08e2b76ca5c5d0c..79950382fb7c95245361e080f179e794d7eff20b 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx.in
+++ b/lib/doc/LaTeXConfig.lyx.in
@@ -2956,7 +2956,7 @@ Notes: The package
 \family sans
 nomencl
 \family default
- is needed by LyX to produce a glossary.
+ is needed by LyX to produce a nomenclature.
 \end_layout
 
 \begin_layout Subsection

diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index 0465b4d65077ada3f321bc8d897c87eaa9077ebc..32dfaa50217b8089b4f4a32c57b244cc4c09e379 100644 (file)
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -221,7 +221,7 @@ Menuset
                Item "Marginal Note|M" "marginalnote-insert"
                Item "Short Title" "optional-insert"
                Item "Index Entry|I" "index-insert"
-               Item "Glossary Entry" "nomencl-insert"
+               Item "Nomenclature Entry" "nomencl-insert"
                Item "URL...|U" "url-insert"
                Item "Note|N" "note-insert"
                Submenu "Lists & TOC|O" "insert_toc"
@@ -310,7 +310,7 @@ Menuset
                Item "Table of Contents|C" "toc-insert"
                FloatListInsert
                Item "Index List|I" "index-print"
-               Item "Glossary|G" "nomencl-print"
+               Item "Nomenclature|N" "nomencl-print"
                Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
        End
 

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 00cd83851f77ed3aa043950c94a06e4eb4b7f01a..b795a3c5a5fdff3141b9a3091f5ebc163cc2bf84 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -302,7 +302,7 @@ Menuset
                Item "Label...|L" "label-insert"
                Item "Caption" "caption-insert"
                Item "Index Entry|d" "index-insert"
-               Item "Glossary Entry...|y" "nomencl-insert"
+               Item "Nomenclature Entry...|y" "nomencl-insert"
                Separator
                Item "Table...|T" "tabular-insert"
                Item "Graphics...|G" "dialog-show-new-inset graphics"
@@ -375,7 +375,7 @@ Menuset
                Item "Table of Contents|C" "toc-insert"
                FloatListInsert
                Item "Index List|I" "index-print"
-               Item "Glossary|G" "nomencl-print"
+               Item "Nomenclature|N" "nomencl-print"
                Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
        End
 

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 617c6c65423f4b6a091b2a0a653b0590aa73cb08..69baf0d7cedbef04a63723b45b84911eb0c6089c 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -92,7 +92,7 @@ ToolbarSet
                Item "Insert cross-reference" "dialog-show-new-inset ref"
                Item "Insert citation" "dialog-show-new-inset citation"
                Item "Insert index entry" "index-insert"
-               Item "Insert glossary entry" "nomencl-insert"
+               Item "Insert nomenclature entry" "nomencl-insert"
                Separator
                Item "Insert footnote" "footnote-insert"
                Item "Insert margin note" "marginalnote-insert"

diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp
index 0735eab547f325870c3fa18c69a0d7d835ef4a02..ba6c04d3d30e8a44176488ae683a3882deb8e214 100644 (file)
--- a/src/frontends/qt4/Dialogs.cpp
+++ b/src/frontends/qt4/Dialogs.cpp
@@ -225,7 +225,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "nomenclature") {
                dialog->setController(new ControlCommand(*dialog, name, name));
-               dialog->setView(new QNomencl(*dialog, _("Glossary Entry")));
+               dialog->setView(new QNomencl(*dialog, _("Nomenclature Entry")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->setController(new ControlCommand(*dialog, name, name));

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 11384b535c412e70ff2b44f1f5b627b2137d5ceb..d3bf218c0e6d01fc0207125f5c54f7c208906e25 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -30,20 +30,20 @@ using std::string;
 
 InsetNomencl::InsetNomencl(InsetCommandParams const & p)
        : InsetCommand(p, "nomenclature"),
-         glossary_entry_id(sgml::uniqueID(from_ascii("gloss")))
+         nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
 {}
 
 
 docstring const InsetNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Glo");
+       return _("Nom");
 }
 
 
 int InsetNomencl::docbook(Buffer const &, odocstream & os,
                OutputParams const &) const
 {
-       os << "<glossterm linkend=\"" << glossary_entry_id << "\">"
+       os << "<glossterm linkend=\"" << nomenclature_entry_id << "\">"
           << sgml::escapeString(getParam("symbol"))
           << "</glossterm>";
        return 0;
@@ -52,7 +52,7 @@ int InsetNomencl::docbook(Buffer const &, odocstream & os,
 
 int InsetNomencl::docbookGlossary(odocstream & os) const
 {
-       os << "<glossentry id=\"" << glossary_entry_id << "\">\n"
+       os << "<glossentry id=\"" << nomenclature_entry_id << "\">\n"
           << "<glossterm>"
           << sgml::escapeString(getParam("symbol"))
           << "</glossterm>\n"
@@ -83,7 +83,7 @@ InsetPrintNomencl::InsetPrintNomencl(InsetCommandParams const & p)
 
 docstring const InsetPrintNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Glossary");
+       return _("Nomenclature");
 }
 
 

diff --git a/src/insets/InsetNomencl.h b/src/insets/InsetNomencl.h
index c76669badf8a65c3cf67ef38764d83f157a58732..96efc4bf4ce4ea0539402b3ecbf2643be5f08b91 100644 (file)
--- a/src/insets/InsetNomencl.h
+++ b/src/insets/InsetNomencl.h
@@ -21,7 +21,7 @@ namespace lyx {
 
 class LaTeXFeatures;
 
-/** Used to insert glossary labels
+/** Used to insert nomenclature entries
   */
 class InsetNomencl : public InsetCommand {
 public:
@@ -44,8 +44,8 @@ private:
        virtual std::auto_ptr<Inset> doClone() const {
                return std::auto_ptr<Inset>(new InsetNomencl(params()));
        }
-       /// unique id for this glossary entry for docbook export
-       docstring glossary_entry_id;
+       /// unique id for this nomenclature entry for docbook export
+       docstring nomenclature_entry_id;
 };