From 417b854eea759050e0eed82f2a30f33541552d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Thu, 30 Nov 2017 13:20:55 +0100
Subject: [PATCH] UserGuide.lyx: fix 2 nomenclature entries

- also assure correct language for the nomenclature list
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |  1 +
 lib/doc/UserGuide.lyx                   | 45 +++++++++++++++++++++++--
 lib/doc/de/UserGuide.lyx                |  4 +--
 lib/doc/es/UserGuide.lyx                | 17 +++++++---
 lib/doc/fr/UserGuide.lyx                | 32 ++++++++++++++----
 lib/doc/ja/UserGuide.lyx                |  8 ++---
 6 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 558c5a9aad..6bbd484144 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -23,6 +23,7 @@ second step:
 - sec. 6.5.3: new sentence for a new option
 - sec. 6.6.7: new item for a new option
 - sec. 6.7: changed sentences for a new option
+- 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
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 682464c2d2..962bdf1856 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -31278,9 +31278,28 @@ should appear in nomenclature entries they need to be escaped by adding
 \begin_inset CommandInset nomenclature
 LatexCommand nomenclature
 symbol "\"@, \"|, \"!, \"\""
-description "The quote sign is output by writing ‘ \"\"\"\" '"
+description "The quote sign is output by writing ' \"\" '"
+literal "true"
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Update description when bug 
+\begin_inset CommandInset href
+LatexCommand href
+name "10825"
+target "http://www.lyx.org/trac/ticket/10825"
 literal "false"
 
+\end_inset
+
+ is fixed.
+\end_layout
+
 \end_inset
 
 
@@ -31329,7 +31348,7 @@ LatexCommand nomenclature
 prefix "sigma"
 symbol "$\\sigma$"
 description "dummy entry for the character \\textsf{sigma}"
-literal "false"
+literal "true"
 
 \end_inset
 
@@ -50276,6 +50295,28 @@ 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
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 76f088f8fa..2a4d2b9ecc 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -30924,7 +30924,7 @@ Sollen die Zeichen |
 
 in Nomenklatureinträgen erscheinen, müssen sie geschützt werden.
  indem man ein Anführungszeichen davor setzt.
- Um zu verhindern, dass das Zeichen " nachfolgende Zeichen beeinflusst,
+ Um zu verhindern, dass das Anführungszeichen nachfolgende Zeichen beeinflusst,
  wird es mit einem leeren \SpecialChar TeX
 -Klammerpaar abgeschlossen: ""{}
 \begin_inset CommandInset nomenclature
@@ -30976,7 +30976,7 @@ LatexCommand nomenclature
 prefix "sigma"
 symbol "$\\sigma$"
 description "Sinnsloseintrag für das Zeichen \\textsf{sigma}"
-literal "false"
+literal "true"
 
 \end_inset
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 735b662734..ed83dd2fac 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -32327,11 +32327,20 @@ Para introducir en entradas de la nomenclatura caracteres como |
 
 , es necesario que vayan precedidos por comillas como secuencia de escape.
  
+\lang english
+To avoid that a single " affects the following characters one writes braces
+ behind it:
+\lang spanish
+ 
+\family sans
+""{}
+\family default
+
 \begin_inset CommandInset nomenclature
 LatexCommand nomenclature
-symbol "\"@, \"|, \"!, \"\""
-description "El carácter comillas se obtiene escribiendo ' \"\"\"\" '"
-literal "false"
+symbol "\"@, \"|, \"!, \"\"{}"
+description "El carácter comillas se obtiene escribiendo ' \"\"{}\"\"{} '"
+literal "true"
 
 \end_inset
 
@@ -32381,7 +32390,7 @@ LatexCommand nomenclature
 prefix "Sigma"
 symbol "$\\sigma$"
 description "entrada postiza para el carácter \\textsf{sigma}"
-literal "false"
+literal "true"
 
 \end_inset
 
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 85249dabf7..49fb7b6049 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9030,14 +9030,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
 
@@ -9050,7 +9048,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9083,7 +9080,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -33339,8 +33335,8 @@ double apostrophe
 \begin_inset CommandInset nomenclature
 LatexCommand nomenclature
 symbol "\"@, \"|, \"!, \"\""
-description "The quote sign is output by writing ‘ \"\"\"\" '"
-literal "false"
+description "Le signe de citation est produit en écrivant ' \"\"\"\" '"
+literal "true"
 
 \end_inset
 
@@ -33390,7 +33386,7 @@ LatexCommand nomenclature
 prefix "sigma"
 symbol "$\\sigma$"
 description "entrée illustrative pour le symbole \\textsf{sigma}"
-literal "false"
+literal "true"
 
 \end_inset
 
@@ -52475,6 +52471,28 @@ 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
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 30870c6a36..305bb4ea47 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -7173,14 +7173,12 @@ Space
 \end_layout
 
 \begin_layout Verbatim
-
 これは原文儘(verbatim)環境です．
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 この下の2行は空白行です．
 \end_layout
 
@@ -7193,7 +7191,6 @@ Space
 \end_layout
 
 \begin_layout Verbatim
-
 右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'`
 \backslash
 }][{|
@@ -7216,7 +7213,6 @@ Space
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -26780,7 +26776,7 @@ textbf{#1}}}
 LatexCommand nomenclature
 symbol "\"@, \"|, \"!, \"\""
 description "引用符は、「 \"\"\"\" 」と書くことで出力されます"
-literal "false"
+literal "true"
 
 \end_inset
 
@@ -26826,7 +26822,7 @@ LatexCommand nomenclature
 prefix "sigma"
 symbol "$\\sigma$"
 description "文字\\textsf{sigma}のダミー項目"
-literal "false"
+literal "true"
 
 \end_inset