From 9ced7384eb5bade7eaf87ab94bc724a52b8b1839 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 24 Feb 2015 01:56:27 +0100
Subject: [PATCH] UserGuide.lyx: port recent changes from branch

---
 lib/doc/UserGuide.lyx    | 22 ++++++++++++++++++++--
 lib/doc/de/UserGuide.lyx | 21 ++++++++++++++++++---
 lib/doc/es/UserGuide.lyx | 25 ++++++++++++++++++++++---
 lib/doc/fr/UserGuide.lyx | 25 +++++++++++++++++++++++--
 lib/doc/ja/UserGuide.lyx | 22 +++++++++++++++++++++-
 5 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 21106ad6a6..86bb5e9b9d 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8054,12 +8054,14 @@ 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
 
@@ -8072,6 +8074,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -34541,8 +34544,23 @@ Graphviz
 \end_layout
 
 \begin_layout Description
-HTML HTML-format (the HTML-converter is a third-party product and may not
- work in all cases)
+HTML HTML-format; 
+\series bold
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ the exported file will be stored in a subdirectory.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 0246b9956a..f37bb80c63 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -35073,7 +35073,7 @@ status open
 \series bold
 Achtung:
 \series default
- nicht alle DVI-Betrachtungsprogramme sind in der Lage dieses Format korrekt
+ Nicht alle DVI-Betrachtungsprogramme sind in der Lage dieses Format korrekt
  anzuzeigen.
 \end_layout
 
@@ -35111,8 +35111,23 @@ Graphviz
 \end_layout
 
 \begin_layout Description
-HTML HTML-Format (Der HTML-Konverter ist kein Bestandteil von LyX und funktionie
-rt eventuell nicht in allen Fällen.)
+HTML HTML-Format; 
+\series bold
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Hinweis:
+\series default
+ Die exportierte Datei wird in einem Unterordner gespeichert.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 858df281de..163ca27652 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -34845,7 +34845,7 @@ status open
 Nota:
 \series default
  actualmente no todos los visores DVI pueden mostrar adecuadamente este
- formato
+ formato.
 \end_layout
 
 \end_inset
@@ -34880,8 +34880,27 @@ Graphviz.
 \end_layout
 
 \begin_layout Description
-HTML formato HTML (el convertidor HTML es un programa externo que no siempre
- funciona).
+HTML formato HTML; 
+\series bold
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Nota:
+\series default
+ 
+\lang english
+the exported file will be stored in a subdirectory
+\lang spanish
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index f2b862f82d..73affe25e3 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -36072,8 +36072,29 @@ Graphviz
 \end_layout
 
 \begin_layout Description
-HTML format HTML (les convertisseurs HTML sont des applications indépendantes
- de LyX et peuvent ne pas fonctionner dans tous les cas);
+HTML format HTML; 
+\series bold
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Nota:
+\series default
+ 
+\lang english
+the exported file will be stored in a subdirectory
+\lang french
+.
+\end_layout
+
+\end_inset
+
+
+\series default
+;
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index f240fc6b4e..dee8281a52 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -29374,7 +29374,27 @@ Dot
 \family sans
 HTML
 \family default
- HTML形式(HTML変換子は第三者製であり、すべての場合に機能するとは限りません)
+ HTML形式
+\series bold
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+【註】
+\series default
+ 
+\lang english
+the exported file will be stored in a subdirectory
+\lang japanese
+。
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Description
-- 
2.39.2