EmbeddedObjects.lyx: add a sentence about branches in child documents

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30235 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index ec5dc1250c50c995034e1258a474611a4559345f..dc88b179a567a44273198f68bfc0f9145cfc9fe4 100644 (file)
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -31011,12 +31011,12 @@ fleqn
 \end_layout
 
 \begin_layout Chapter
-External Stuff
+External Document Parts
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-External Stuff
+External Document Parts
 \end_layout
 
 \end_inset
@@ -31091,7 +31091,7 @@ External Material
 status collapsed
 
 \begin_layout Plain Layout
-External Stuff ! External Material
+External Document Parts ! External Material
 \end_layout
 
 \end_inset
@@ -31587,7 +31587,7 @@ name "sec:Child-Documents"
 status collapsed
 
 \begin_layout Plain Layout
-External Stuff ! Child Documents
+External Document Parts ! Child Documents
 \end_layout
 
 \end_inset
@@ -31629,8 +31629,8 @@ Document
 Class
 \family default
 .
- This master file will then be used in the background by LyX when you edit
- the child document.
+ This master document will then be used in the background by LyX when you
+ edit the child document.
 \end_layout
 
 \begin_layout Standard
@@ -31711,6 +31711,8 @@ reference "sub:External-Subsection-1"
 \begin_layout Standard
 The preamble of the child document is ignored, only the preamble of the
  master document is used.
+ Branches in child documents will be ignored by the master document as long
+ as also the master document has a branch with the same name.
  Included documents are inserted starting on a new page and end with a page
  break.
 \end_layout

diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 5c74a5f57bc12fb7a621299c74b49cc864628d5f..432293f8448d28cce94cf5a071d27d2e62e4e32b 100644 (file)
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.3svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.4svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -32065,6 +32065,8 @@ reference "uab:Externer-Unterabschnitt-1"
 \begin_layout Standard
 Der LaTeX-Vorspann des Unterdokuments wird ignoriert, nur der des Hauptdokuments
  wird benutzt.
+ Zweige in Unterdokumenten werden vom Hauptdokument ignoriert, wenn das
+ Hauptdokument nicht auch einen Zweig mit dem selben Namen besitzt.
  Unterdokumente, die per 
 \family sans
 Include

diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index f5ec8f5dea5b0d26cb14380778c4d3a7ae6b947d..ae2efae5e2f28ef241440dfce7119d5995c2e730 100644 (file)
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.3svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.4svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -31297,6 +31297,12 @@ reference "sub:Subsección-Externa-1"
 \begin_layout Standard
 El preámbulo del documento hijo se ignora, sólo se utiliza el preámbulo
  del documento maestro.
+ 
+\lang english
+Branches in child documents will be ignored by the master document as long
+ as also the master document has a branch with the same name.
+
+\lang spanish
  Los documentos incluidos se insertan comenzando una página nueva y acabando
  con un salto de página.
 \end_layout

diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 47089bfe2e1b7bdd31f34e9df2201705f70acefe..3f6943fbf7c6b36585cd1cde24f1244d13b13463 100644 (file)
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.3svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.4svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -32070,6 +32070,12 @@ reference "sub:Sous-section-externe-1"
 \begin_layout Standard
 Le préambule du sous-document est tout simplement ignoré, seul le préambule
  du document maître est utilisé.
+ 
+\lang english
+Branches in child documents will be ignored by the master document as long
+ as also the master document has a branch with the same name.
+
+\lang french
  Les documents inclus sont insérés en commençant une nouvelle page et sont
  suivis par un saut de page.
 \end_layout