From b3cd270d3b6935cc67a636076a55e1edcdbe71a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Thu, 22 Nov 2007 23:57:21 +0000
Subject: [PATCH] EmbeddedObjects.lyx: add info about dissolving notes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@21725 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/EmbeddedObjects.lyx    | 30 ++++++++++++++
 lib/doc/de/EmbeddedObjects.lyx |  7 ++--
 lib/doc/es/EmbeddedObjects.lyx | 34 ++++++++++++++++
 lib/doc/fr/EmbeddedObjects.lyx | 73 ++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 4 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 7b45c74076..6ab258a990 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -21956,6 +21956,9 @@ button
 \series default
 \bar default
 .
+ To change a note to text, press the backspace key when the cursor is in
+ the first position of a note, or press the deletey key when the cursor
+ is in the very last position of the note, respectively.
 \end_layout
 
 \begin_layout Standard
@@ -22374,6 +22377,33 @@ button
 \series default
 \bar default
 .
+ To change a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+ to text, press the Backspace key when the cursor is in the first position
+ of a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, or press the Delete key when the cursor is in the very last position of
+ the 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, respectively.
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index ce9ad81e39..c7a510ec24 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -22929,6 +22929,9 @@ LyX-Notiz
  anderen Möglichkeiten auswählen.
  Wenn Sie einen vorhandenen Text in eine Notiz verwandeln wollen, markieren
  Sie ihn und klicken dann auf den Werzeugleistenknopf.
+ Um eine Notiz in Text zu verwandeln, drücken Sie die Backspace Taste, wenn
+ der Cursor am Beginn der Notiz ist oder die Entfernen Taste, wenn der Cursor
+ am Ende der Notiz ist.
 \end_layout
 
 \begin_layout Standard
@@ -23269,10 +23272,6 @@ name "Fußnoten"
 Zu dem, was bereits im 
 \emph on
 Benutzerhandbuch
-\emph default
- und in den 
-\emph on
-Handbuchergänzungen
 \emph default
  über Fußnoten geschrieben wurde, folgen hier noch ein paar Anmerkungen.
 \color black
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index aa060551ae..68cebc4eba 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -22138,6 +22138,11 @@ Si quieres convertir un texto presente a nota, márcalo y pincha sobre el
 nota
 \family default
 .
+ 
+\lang english
+To change a note to text, press the backspace key when the cursor is in
+ the first position of a note, or press the deletey key when the cursor
+ is in the very last position of the note, respectively.
 \end_layout
 
 \begin_layout Standard
@@ -22559,6 +22564,35 @@ botón
 \series default
 \bar default
 .
+ 
+\lang english
+To change a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+ to text, press the Backspace key when the cursor is in the first position
+ of a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, or press the Delete key when the cursor is in the very last position of
+ the 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, respectively.
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index f89d878af6..f44d1ee27d 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -22302,6 +22302,50 @@ reference "sec:Boîtes-colorées"
 \begin_inset VSpace bigskip
 \end_inset
 
+
+\lang english
+When you use the toolbar button 
+\begin_inset Graphics
+	filename D:/LyXSVN/LyX1.5.x/lib/images/note-insert.xpm
+	scale 85
+	scaleBeforeRotation
+
+\end_inset
+
+ to insert notes, a 
+\family sans
+LyX\InsetSpace ~
+Note
+\family default
+ is inserted.
+ You can switch between the five note types by right-clicking on the note-box.
+ 
+\family roman
+\series medium
+\bar no
+If you want to turn existing text into a note, mark it and click on the
+ note
+\family default
+\series default
+\bar default
+ toolbar 
+\family roman
+\series medium
+\bar no
+button
+\family default
+\series default
+\bar default
+.
+ To change a note to text, press the backspace key when the cursor is in
+ the first position of a note, or press the deletey key when the cursor
+ is in the very last position of the note, respectively.
+\end_layout
+
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
 Vous pouvez changer la couleur du texte des notes grisées en mettant les
  commandes suivantes dans le préambule :
 \end_layout
@@ -22719,6 +22763,35 @@ de\InsetSpace ~
 Page
 \family default
  de la barre d'outils.
+ 
+\lang english
+To change a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+ to text, press the Backspace key when the cursor is in the first position
+ of a 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, or press the Delete key when the cursor is in the very last position of
+ the 
+\family roman
+\series medium
+\bar no
+footnote
+\family default
+\series default
+\bar default
+, respectively.
 \end_layout
 
 \begin_layout Standard