replace "Notation Entry" by "Glossary Entry" and "Notation List" by "Glossary"

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

diff --git a/lib/doc/Extended.lyx b/lib/doc/Extended.lyx
index d7cb91659ac7e9d12bcd8e96bd988854ad49c8c8..60ceda109c714cb0db23e173d39709fa9e13a24a 100644 (file)
--- a/lib/doc/Extended.lyx
+++ b/lib/doc/Extended.lyx
@@ -2669,7 +2669,7 @@ Be careful not to put spaces between the word in the text and the index
 \end_layout
 
 \begin_layout Section
-Notation Lists
+Glossaries
 \end_layout
 
 \begin_layout Standard
@@ -2698,11 +2698,11 @@ nomencl
 \end_layout
 
 \begin_layout Standard
-A notation entry is created if you place the cursor after a symbol entry
+A glossary entry is created if you place the cursor after a symbol entry
  and then use the menu 
 \family sans
 Insert\SpecialChar \menuseparator
-Notation\InsetSpace ~
+Glossary\InsetSpace ~
 Entry
 \family default
 .
@@ -2718,21 +2718,21 @@ Not
 \begin_inset Quotes erd
 \end_inset
 
- is inserted and a window pops up asking for the notation entry.
- A notation entry consists of two main entries.
+ is inserted and a window pops up asking for the glossary entry.
+ A glossary entry consists of two main entries.
  The first is the symbol that you want to refer to.
  You should enter a valid LaTeX code for the corresponding field in the
- notation dialog.
+ glossary dialog.
  The second is the description of the symbol.
- You should fill the corresponding field to complete the notation entry.
+ You should fill the corresponding field to complete the glossary entry.
 \end_layout
 
 \begin_layout Subsection
-Sort Order of Notation Entries
+Sort Order of Glossary Entries
 \end_layout
 
 \begin_layout Standard
-Suppose you have two notation entries for the symbols 
+Suppose you have two glossary entries for the symbols 
 \begin_inset Formula $a$
 \end_inset
 
@@ -2746,7 +2746,7 @@ Suppose you have two notation entries for the symbols
 nomencl
 \family default
  package automatically sorts these two entries considering the symbol entry,
- while printing the Notation List.
+ while printing the Glossary.
  However, this can lead to an undesired sort order.
  For the example given, the first entry appears as 
 \family typewriter
@@ -2783,7 +2783,7 @@ sigma$
 Sort\InsetSpace ~
 as
 \family default
- field of the notation dialog.
+ field of the glossary dialog.
  For the given example, you can edit this field as 
 \family typewriter
 a
@@ -2815,7 +2815,7 @@ Referencing
 \end_layout
 
 \begin_layout Standard
-You can turn on referencing to the equations and pages in the notation entries.
+You can turn on referencing to the equations and pages in the glossary entries.
  For this purpose, you should add referencing options commands at the end
  of description field.
  There are six referencing options in nomencl package:
@@ -2887,17 +2887,16 @@ Turns off corresponding referencing options if they are turned on globally
 \end_layout
 
 \begin_layout Subsection
-Printing Notation List
+Printing Glossary
 \end_layout
 
 \begin_layout Standard
-You can insert the notation list with the menu 
+You can insert the glossary with the menu 
 \family sans
 Insert\SpecialChar \menuseparator
 Lists\InsetSpace ~
 &TOC\SpecialChar \menuseparator
-Notation\InsetSpace ~
-List
+Glossary
 \family default
 .
  A light blue box labeled 
@@ -2906,7 +2905,7 @@ List
 
 
 \family sans
-Notation
+Glossary
 \family default
 
 \begin_inset Quotes erd
@@ -2914,7 +2913,7 @@ Notation
 
  will show the place where the index is printed in the output.
  The index list box is not clickable like other LyX-boxes.
- In the printed output the title of the notation list appears as 
+ In the printed output the title of the glossary appears as 
 \series bold
 Nomenclature
 \series default
@@ -2944,7 +2943,7 @@ List of Symbols
 \emph default
  for the 
 \emph on
-Notation List
+Glossary
 \emph default
  add the following line to the preamble.
 \end_layout

diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in
index 4bea192efd2863e9e7844bbc9e81a797dc4c43f3..24cca9c9d16b5b1a5f3f7fa7913a2d0ac0dcd228 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx.in
+++ b/lib/doc/LaTeXConfig.lyx.in
@@ -2858,7 +2858,7 @@ Notes: The package
 \family sans
 nomencl
 \family default
- is needed by LyX to produce a notation list.
+ is needed by LyX to produce a glossary.
 \end_layout
 
 \begin_layout Subsection

diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index b9c1e5efe495b835cad186f4b155de11467a8c30..482bbfc9935632f0464dac7a31e49037372440db 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 "Notation Entry" "nomencl-insert"
+               Item "Glossary Entry" "nomencl-insert"
                Item "URL...|U" "url-insert"
                Item "Note|N" "note-insert"
                Submenu "Lists & TOC|O" "insert_toc"
@@ -311,7 +311,7 @@ Menuset
                Item "Table of Contents|C" "toc-insert"
                FloatListInsert
                Item "Index List|I" "index-print"
-               Item "Notation List|N" "nomencl-print"
+               Item "Glossary|G" "nomencl-print"
                Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
        End
 

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 9dc0d5b2832ea442b962e4895fcb02f95045419c..df2e5b0d6fa8b64b4de401abf9ba5cbbd14451aa 100644 (file)
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -222,7 +222,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, _("Notation Entry")));
+               dialog->setView(new QNomencl(*dialog, _("Glossary Entry")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->setController(new ControlCommand(*dialog, name, name));

diff --git a/src/insets/insetnomencl.C b/src/insets/insetnomencl.C
index b694e12f4c0098114b92644bb8c65f775365ede7..2e813730f4bf51eaaa049454997452f1151ce76f 100644 (file)
--- a/src/insets/insetnomencl.C
+++ b/src/insets/insetnomencl.C
@@ -32,7 +32,7 @@ InsetNomencl::InsetNomencl(InsetCommandParams const & p)
 
 docstring const InsetNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Not");
+       return _("Glo");
 }
 
 
@@ -71,7 +71,7 @@ InsetPrintNomencl::InsetPrintNomencl(InsetCommandParams const & p)
 
 docstring const InsetPrintNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Notation");
+       return _("Glossary");
 }
 
 

diff --git a/src/insets/insetnomencl.h b/src/insets/insetnomencl.h
index f706a116a378cd882e9d19036467d745a407186b..c5cc48a25c14e26cf3d52033777aec44ca70910c 100644 (file)
--- a/src/insets/insetnomencl.h
+++ b/src/insets/insetnomencl.h
@@ -21,7 +21,7 @@ namespace lyx {
 
 class LaTeXFeatures;
 
-/** Used to insert notation labels
+/** Used to insert glossary labels
   */
 class InsetNomencl : public InsetCommand {
 public: