Remove obsoleted nomencl workarounds

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 6bbd484144269fa779be19db141aacd7337af308..7fb3a6e988931c6c26d68361d03a86f12c42a6cd 100644 (file)
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -26,7 +26,6 @@ second step:
 - sec. 6.7.1: Spanish only: new sentence
 - sec. C.2.2.1: new paragraph (not French)
 - sec. D: new table row
-- nomenclature: French only: new LyX comment
 
 
 For LyX 2.2.3:

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 962bdf18568026acf557394948194f2757c2d663..3f7d1fdabf68d110bff9cd93fb495c706cff904b 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8336,14 +8336,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8356,7 +8354,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8380,7 +8377,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -31615,7 +31611,7 @@ page
 \begin_inset Quotes erd
 \end_inset
 
- are automatically translated for some document languages.
+ are automatically translated for most document languages.
  If not, add these lines to your \SpecialChar LaTeX
  preamble:
 \end_layout
@@ -50289,69 +50285,6 @@ The above bibliography is created from a Bib\SpecialChar TeX
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-def
-\backslash
-eqdeclaration#1{, see equation
-\backslash
-nobreakspace(#1)}
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-def
-\backslash
-pagedeclaration#1{, page
-\backslash
-nobreakspace#1}
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-nomname}{Nomenclature}
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-The name of the nomenclature has to be redefined to English because a bug
- in the 
-\series bold
-nomencl
-\series default
- package takes the last used language for the title that is not the document
- language.
- See 
-\begin_inset CommandInset href
-LatexCommand href
-name "this"
-target "https://tex.stackexchange.com/questions/65913/why-nomenclature-text-is-not-english-when-loading-additional-languages-in-docume"
-literal "false"
-
-\end_inset
-
- for a detailed explanation of the bug.
-\end_layout
-
-\end_inset
-
-
 \begin_inset CommandInset nomencl_print
 LatexCommand printnomenclature
 set_width "auto"

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 2a4d2b9ecc4728fbdde26a33e64667dfe193369c..803cbd92f4b54ab23b4eb4c47c8b019daab4b5e3 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -45,11 +45,6 @@
  {\usepackage{array}}{}
 \setlength{\extrarowheight}{2pt}
 
-%für deutsche Nomenlatur
-\renewcommand{\eqdeclaration}[1]{, siehe Gleichung\nobreakspace(#1)}
-\renewcommand{\pagedeclaration}[1]{, Seite\nobreakspace{}#1}
-\renewcommand{\nomname}{Nomenklatur}
-
 % workaround for a makeindex bug, 
 % see sec. "Index Entry Order"
 % only uncomment this when you are using makindex
@@ -8603,12 +8598,10 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
-
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
-
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8621,7 +8614,6 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
-
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -8645,7 +8637,6 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
-
 Dies ist Unformatiert*.
 \end_layout
 
@@ -31174,8 +31165,17 @@ nomnorefeqpage schaltet die entsprechende Option ab
 \end_layout
 
 \begin_layout Standard
-Damit Wörter wie „Seite“ auch auf Deutsch und nicht in Englisch erscheinen,
- fügen Sie diese Zeilen dem \SpecialChar LaTeX
+Für die meisten Sprachen (auch für Deutsch) werden Ausdrücke wie 
+\begin_inset Quotes gld
+\end_inset
+
+Seite
+\begin_inset Quotes grd
+\end_inset
+
+ automatisch übersetzt.
+ Wenn Sie diese Übersetzungen ändern wollen, fügen Sie diese Zeilen dem
+ \SpecialChar LaTeX
 -Vorspann ihres Dokuments hinzu:
 \end_layout
 
@@ -31282,7 +31282,11 @@ Benutzerdefiniert benutzerdefinierte Breite
 \end_layout
 
 \begin_layout Standard
-In der Druckausgabe erscheint die Nomenklatur als „Nomenclature“.
+In der Druckausgabe erscheint die Nomenklatur als „Nomenklatur
+\begin_inset Quotes grd
+\end_inset
+
+.
  Sie können den Namen im \SpecialChar LaTeX
 -Vorspann mit dieser Zeile ändern:
 \end_layout
@@ -31294,7 +31298,7 @@ In der Druckausgabe erscheint die Nomenklatur als „Nomenclature“.
 \backslash
 renewcommand{
 \backslash
-nomname}{Nomenklatur}
+nomname}{Symbolverzeichnis}
 \end_layout
 
 \begin_layout Subsection

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 49fb7b6049fe34e5db59b8b500109726821f0225..e335cd67cd324396d40679ca209ed13883b5019b 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -33818,7 +33818,7 @@ Dans la sortie imprimée le titre du glossaire devrait apparaître comme
 \begin_inset Quotes cld
 \end_inset
 
-Nomenclature
+Liste des symboles
 \begin_inset Quotes crd
 \end_inset
 
@@ -33833,7 +33833,7 @@ nomname
  dans le préambule.
  Par exemple, si vous voulez utiliser 
 \emph on
-Liste des Symboles
+Nomenclature
 \emph default
 , ajoutez la ligne suivante au préambule:
 \end_layout
@@ -33845,7 +33845,7 @@ Liste des Symboles
 \backslash
 renewcommand{
 \backslash
-nomname}{Liste des Symboles}
+nomname}{Nomenclature}
 \end_layout
 
 \begin_layout Subsection
@@ -52465,75 +52465,6 @@ La bibliographie ci-dessus a été créée à partir d'une base de données Bib\
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-def
-\backslash
-eqdeclaration#1{, voir équation
-\backslash
-nobreakspace(#1)}
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-def
-\backslash
-pagedeclaration#1{, page
-\backslash
-nobreakspace#1}
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-nomname}{Nomenclature}
-\end_layout
-
-\end_inset
-
-
-\lang english
-
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-The name of the nomenclature has to be redefined to English because a bug
- in the 
-\series bold
-nomencl
-\series default
- package takes the last used language for the title that is not the document
- language.
- See 
-\begin_inset CommandInset href
-LatexCommand href
-name "this"
-target "https://tex.stackexchange.com/questions/65913/why-nomenclature-text-is-not-english-when-loading-additional-languages-in-docume"
-literal "false"
-
-\end_inset
-
- for a detailed explanation of the bug.
-\end_layout
-
-\end_inset
-
-
-\lang french
-
 \begin_inset CommandInset nomencl_print
 LatexCommand printnomenclature
 set_width "auto"