UserGuide.lyx: fix some shortcut issues after [ea8248fc/lyxgit]

- German UserGuide.lyx: add missing image showing the abstract environment

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 3293019ab6674bbb07efad1c137a008be04bfdca..d2b8f33b9e4a9233da9f6f8a8134e6014b47f74f 100644 (file)
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -96,7 +96,8 @@ dist_declipartdoc_DATA = \
        de/clipart/Marke.png \
        de/clipart/Querverweis.png \
        de/clipart/StandardBoxQt4.png \
-       de/clipart/UnterdokumentQt4.png
+       de/clipart/UnterdokumentQt4.png \
+       de/clipart/Zusammenfassung.pdf
 
 eldocdir = $(docdir)/el
 dist_eldoc_DATA = \

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 9b6846160f5db28131203cdfde13db31920ff95f..3c771debd278468e28b2f08d3970b42107156f2d 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -6034,7 +6034,7 @@ Protected Space
  (Use either 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
  or the menu 
@@ -7869,33 +7869,15 @@ arg   "newline-insert newline"
 \family sans
 Space
 \family default
-.
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-Use a 
-\family sans
-Return
-\family default
- to begin a new paragraph, then you can use a 
-\family sans
-Space
-\family default
-.
-\end_layout
-
-\begin_layout Itemize
-Or: use 
+ but with a 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
- instead.
+.
 \end_layout
 
-\end_deeper
 \begin_layout Itemize
 You can't have an empty paragraph or an empty line.
  You must put at least one 
@@ -10151,7 +10133,7 @@ Space
  (shortcut 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
 ).
@@ -23274,7 +23256,7 @@ You may want to create spaces that differ from the standard spacing that
  To do this, press 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
  or use the 

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 4093ed690ce4ed9b4320d95d6a7ef42f0b2b302a..f511bc842c10d0ff0228a5a41cf7092c370fdfbd 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8019,9 +8019,64 @@ Zusammenfassung
  ändern.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Float figure
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Graphics
+       filename clipart/Zusammenfassung.pdf
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+\begin_inset CommandInset label
+LatexCommand label
+name "fig:Absatz-in-der"
+
+\end_inset
+
+Absatz in der 
+\family sans
+Zusammenfassung
+\family default
+-Umgebung.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Wir würden Ihnen gern ein Beispiel zeigen, aber das geht nicht, weil dieses
  Dokument eine Buch-Klasse benutzt.
+ Wir haben es daher als Abbildung
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "fig:Absatz-in-der"
+
+\end_inset
+
+ eingefügt.
  Wenn Sie noch nie von einer Zusammenfassung gehört haben, können Sie diese
  Umgebung ruhig ignorieren.
 \end_layout
@@ -8373,6 +8428,10 @@ LyX-Code
 Diese Umgebung hat ein paar Marotten:
 \end_layout
 
+\begin_layout Standard
+a
+\end_layout
+
 \begin_layout Itemize
 Am Anfang eines neuen Absatzes kann man 
 \family sans
@@ -8389,6 +8448,22 @@ Strg+Eingabe
  folgen).
 \end_layout
 
+\begin_layout Itemize
+Auf 
+\family sans
+Strg+Eingabe
+\family default
+ kann keine 
+\family sans
+Leertaste
+\family default
+ folgen, aber 
+\family sans
+Strg+Leertaste
+\family default
+.
+\end_layout
+
 \begin_layout Itemize
 In der Druckausgabe gibt es keine leeren Absätze und keine leeren Zeilen.
  Sie müssen in jeder leeren Zeile mindestens einmal die Leertaste drücken.

diff --git a/lib/doc/de/clipart/Zusammenfassung.pdf b/lib/doc/de/clipart/Zusammenfassung.pdf
new file mode 100644 (file)
index 0000000..ee4a146
Binary files /dev/null and b/lib/doc/de/clipart/Zusammenfassung.pdf differ

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 565ea84c2d77e3c280b720e6cc244c346e3f290d..1febfad9fc07d73c1d6d7ef3af7d6e50f874ce90 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -7868,7 +7868,7 @@ name "fig:Párrafo-en"
 
 Párrafo en un entorno 
 \family sans
-Resumen
+Resumen.
 \end_layout
 
 \end_inset
@@ -8134,31 +8134,13 @@ Ctrl+Entrar
 \family sans
 Espacio
 \family default
-.
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-Usa un 
-\family sans
-Entrar
-\family default
- para iniciar un párrafo, entonces puedes poner un 
-\family sans
-Espacio
-\family default
-.
-\end_layout
-
-\begin_layout Itemize
-O: usa 
+ pero con 
 \family sans
 Ctrl+Espacio
 \family default
- en su lugar.
+.
 \end_layout
 
-\end_deeper
 \begin_layout Itemize
 No puede tener un párrafo vacío o una línea vacía.
  Al menos debes poner un 

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index e44b24707cccff816f863e125fb8886ae1ae471a..ee4bbf1dfde73f7c162796568a87d4f794d8f745 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -6336,7 +6336,7 @@ Insécable
  (Soit avec 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
  soit avec 
@@ -8021,7 +8021,7 @@ name "fig:Paragraphe-dans-l'environnement"
 
 Paragraphe dans l'environnement 
 \family sans
-Résumé
+Résumé.
 \end_layout
 
 \end_inset
@@ -8305,31 +8305,17 @@ arg   "newline-insert newline"
 
  d'une 
 \family sans
-Espace;
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-utilisez 
-\family sans
-Entrée
+Espace 
 \family default
- pour commencer un nouveau paragraphe, vous pourrez alors utiliser une 
-\family sans
-Espace,
-\end_layout
-
-\begin_layout Itemize
-ou utilisez 
+mais d'une 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
- à la place,
+.
 \end_layout
 
-\end_deeper
 \begin_layout Itemize
 vous ne pouvez pas avoir un paragraphe vide ou une ligne vide.
  Vous devez mettre au moins une 
@@ -10753,7 +10739,7 @@ insécable
  (raccourci 
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
 ).
@@ -24416,15 +24402,11 @@ Math ! Espacement
 Vous voudrez peut-être créer des espaces qui soient différents de l'espacement
  proposé implicitement par LaTeX.
  Pour cela, tapez 
-\family sans
-
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
-
-\family default
  ou utilisez le bouton 
 \family sans
 

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index f5536452ef86db869468d1cac8524d64ad802039..ce16e1240c42bf73dfb3cd7927cc081b32e678c3 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -5179,7 +5179,7 @@ status collapsed
 を使用します(
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
 と入力するか、
@@ -6485,7 +6485,7 @@ Return
 \begin_inset Float figure
 wide false
 sideways false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 \align center
@@ -6511,7 +6511,7 @@ name "fig:概要環境内の段落"
 \family sans
 概要
 \family default
-環境内の段落
+環境内の段落。
 \end_layout
 
 \end_inset
@@ -6777,37 +6777,19 @@ arg   "newline-insert newline"
 \family sans
 Space
 \family default
-を入れることができません。
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-
-\family sans
-Return
-\family default
-を使って新しい段落を始めて、それから
-\family sans
-Space
-\family default
-を使って下さい。
-\end_layout
+を入れることができません
+\lang english
+ but by a 
+\lang japanese
 
-\begin_layout Itemize
-または、
-\family sans
-Space
-\family default
-の代わりに
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
-ã\82\92使ã\81£ã\81¦ä¸\8bã\81\95ã\81\84ã\80\82
+。
 \end_layout
 
-\end_deeper
 \begin_layout Itemize
 何も入っていない段落や何も入っていない行を作ることはできません。空白にしたい行には、少なくとも一つの
 \family sans
@@ -8767,15 +8749,11 @@ status collapsed
 \end_inset
 
 は
-\family sans
-
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
-
-\family default
 )で挿入することができます。
 \end_layout
 
@@ -19699,15 +19677,11 @@ status collapsed
 
 \begin_layout Standard
 LaTeXの提供する標準的な余白取りとは異なる余白を使いたいことがあるかもしれません。この場合は、
-\family sans
-
 \begin_inset Info
 type  "shortcut"
-arg   "command-alternatives space-insert protected ; math-space"
+arg   "command-alternatives math-space ; space-insert protected"
 \end_inset
 
-
-\family default
 を押すか、
 \family sans
 数式パネル