From 696ee1157da873239f5620e10aea5e964be5cdde Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Mon, 20 Dec 2010 12:41:37 +0000
Subject: [PATCH] =?utf8?q?UserGuide.lyx:=20describe=20new=20branches=20fea?=
 =?utf8?q?tures,=20thanks=20J=C3=BCrgen!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36965 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/UserGuide.lyx    | 136 ++++++++++++++++++++++++++++++++++--
 lib/doc/de/UserGuide.lyx | 141 +++++++++++++++++++++++++++++++++++---
 lib/doc/es/UserGuide.lyx | 129 ++++++++++++++++++++++++++++++++++-
 lib/doc/fr/UserGuide.lyx | 133 +++++++++++++++++++++++++++++++++++-
 lib/doc/ja/UserGuide.lyx | 144 ++++++++++++++++++++++++++++++++++++++-
 5 files changed, 664 insertions(+), 19 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 64d193e5d4..08ab043c72 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -28216,7 +28216,13 @@ Sometimes it is useful to hide some document parts in the output.
 \begin_layout Standard
 For these cases LyX allows you to put text into branches.
  The text will then only appear in the output when its branch is activated.
- To create a branch, go in the 
+ To create a branch, either select the menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Branch\SpecialChar \menuseparator
+Insert New Branch
+\family default
+ (if you just want to specify a new branch) or go in the 
 \family sans
 Document\SpecialChar \menuseparator
 Settings
@@ -28225,9 +28231,30 @@ Settings
 \family sans
 Branches
 \family default
-.
- The name of the branch, its activation state and the background color of
- the branches inside LyX can be specified in this dialog.
+, where you can specify and change the name of the branch, its activation
+ state (whether the content of the branch is shown in the output or not),
+ its background color inside LyX and whether the name of the branch should
+ be appended to the document file name on export if the branch is active
+ (see below for an example).
+ Furthermore, the dialog lets you merge two branches (just rename one branch
+ to the name of the other) and to add 
+\begin_inset Quotes eld
+\end_inset
+
+unknown branches
+\begin_inset Quotes erd
+\end_inset
+
+ (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e.
+\begin_inset space ~
+\end_inset
+
+branches that were added to the document via copy and paste from other documents
+, without having being defined) to the document's branch list.
 \end_layout
 
 \begin_layout Standard
@@ -28238,7 +28265,8 @@ Insert\SpecialChar \menuseparator
 Branch
 \family default
  where you can choose a branch.
- You can later change the branch of the boxes by right-clicking on them.
+ You can later change the activation state of the branch by right-clicking
+ on them.
 \end_layout
 
 \begin_layout Standard
@@ -28272,6 +28300,104 @@ Answer: Wilhelm Conrad Röntgen
 
 \end_layout
 
+\begin_layout Standard
+If you activate 
+\family sans
+Filename Suffix
+\family default
+ in 
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Branches
+\family default
+, the name of the active branches will be appended to the file name at export.
+ Consider for example a file 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.lyx
+\begin_inset Quotes erd
+\end_inset
+
+ which has the above branches.
+ If 
+\begin_inset Quotes eld
+\end_inset
+
+Filename Suffix
+\begin_inset Quotes erd
+\end_inset
+
+ is active, the PDF export file would be called 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch were inactive, 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, likewise 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, and 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both branches were active.
+ This helps you to easily export different versions of your document without
+ much hassle.
+\end_layout
+
 \begin_layout Standard
 \begin_inset VSpace bigskip
 \end_inset
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 10c983c866..aee2944b5f 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -32833,7 +32833,14 @@ Zweigen
 
 \begin_layout Standard
 Zuerst müssen Sie die verschiedenen Zweige definieren.
- Das machen Sie in 
+ Das machen entweder indem Sie das Menü 
+\family sans
+Einfügen\SpecialChar \menuseparator
+Zweig\SpecialChar \menuseparator
+Neuen Zweig einfügen
+\family default
+ verwenden (falls Sie nur einen neuen Zweig anlegen möchten), oder im Menü
+ 
 \family sans
 Dokument\SpecialChar \menuseparator
 Einstellungen\SpecialChar \menuseparator
@@ -32852,12 +32859,9 @@ Hinzufügen
 \family default
 .
  Der Name erscheint im unteren Feld, wo Sie ihn bearbeiten können.
-\end_layout
-
-\begin_layout Standard
-Dort können Sie den Zweig 
+ Dort können Sie den Zweig 
 \family sans
-(de)aktivieren
+(De)aktivieren
 \family default
 , ihm eine 
 \family sans
@@ -32868,7 +32872,27 @@ Farbe
 Entfernen
 \family default
 .
- Wenn Sie nun Text für einen Zweig schreiben wollen, wählen Sie ihn unter
+ 
+\lang english
+Furthermore, the dialog lets you merge two branches (just rename one branch
+ to the name of the other) and to add 
+\begin_inset Quotes eld
+\end_inset
+
+unknown branches
+\begin_inset Quotes erd
+\end_inset
+
+ (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e., branches that were added to the document via copy and paste from other
+ documents, without having being defined) to the document's branch list.
+\end_layout
+
+\begin_layout Standard
+Wenn Sie nun Text für einen Zweig schreiben wollen, wählen Sie ihn unter
  
 \family sans
 Einfügen\SpecialChar \menuseparator
@@ -32918,7 +32942,108 @@ Antwort: Wilhelm Conrad Röntgen
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace medskip
+Wenn Sie 
+\family sans
+Dateinamensendung
+\family default
+ im Menü 
+\family sans
+Dokument\SpecialChar \menuseparator
+Einstellungen\SpecialChar \menuseparator
+Zweige
+\family default
+ aktivieren, wird der Name des aktiven Zweigs beim Export des Dokuments
+ an den Dateinamen angehängt.
+ 
+\lang english
+Consider for example a file 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.lyx
+\begin_inset Quotes erd
+\end_inset
+
+ which has the above branches.
+ If 
+\begin_inset Quotes eld
+\end_inset
+
+Filename Suffix
+\begin_inset Quotes erd
+\end_inset
+
+ is active, the PDF export file would be called 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch were inactive, 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, likewise 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, and 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both branches were active.
+ This helps you to easily export different versions of your document without
+ much hassle.
+\end_layout
+
+\begin_layout Standard
+\begin_inset VSpace bigskip
 \end_inset
 
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 254726f42a..742ec96ec0 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -28605,7 +28605,17 @@ s de un examen en el mismo documento, pero no quiere, evidentemente, que
 \begin_layout Standard
 Para casos como éste, LyX ofrece la herramienta llamada «ramas».
  El texto de una rama sólo aparecerá en la salida si la rama está activada.
- Para crear una rama, en el diálogo 
+ Para crear una rama, 
+\lang english
+either select the menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Branch\SpecialChar \menuseparator
+Insert New Branch
+\family default
+ (if you just want to specify a new branch), or go 
+\lang spanish
+en el diálogo 
 \family sans
 Documento\SpecialChar \menuseparator
 Configuración
@@ -28617,6 +28627,23 @@ Ramas
 .
  Ahí puedes poner el nombre de la rama, activarla o cambiar su color de
  fondo en LyX.
+ 
+\lang english
+Furthermore, the dialog lets you merge two branches (just rename one branch
+ to the name of the other) and to add 
+\begin_inset Quotes eld
+\end_inset
+
+unknown branches
+\begin_inset Quotes erd
+\end_inset
+
+ (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e., branches that were added to the document via copy and paste from other
+ documents, without having being defined) to the document's branch list.
 \end_layout
 
 \begin_layout Standard
@@ -28661,6 +28688,106 @@ Respuesta: Wilhelm Conrad Röntgen
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+If you activate 
+\family sans
+Filename Suffix
+\family default
+ in 
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Branches
+\family default
+, the name of the active branches will be appended to the file name at export.
+ Consider for example a file 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.lyx
+\begin_inset Quotes erd
+\end_inset
+
+ which has the above branches.
+ If 
+\begin_inset Quotes eld
+\end_inset
+
+Filename Suffix
+\begin_inset Quotes erd
+\end_inset
+
+ is active, the PDF export file would be called 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch were inactive, 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, likewise 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, and 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both branches were active.
+ This helps you to easily export different versions of your document without
+ much hassle.
+\end_layout
+
 \begin_layout Standard
 \begin_inset VSpace bigskip
 \end_inset
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 6b6ffea7b1..62e56cbd3d 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -107,12 +107,12 @@
 \branch Question
 \selected 1
 \filename_suffix 0
-\color #aa55ff
+\color #00ff00
 \end_branch
 \branch Réponses
 \selected 0
 \filename_suffix 0
-\color #00ff00
+\color #aa55ff
 \end_branch
 \index Index
 \shortcut idx
@@ -29473,7 +29473,17 @@ Il est parfois utile de masquer une partie du document à l'impression.
 \begin_layout Standard
 Dans ces cas, LyX permet de créer plusieurs branches pour le même document.
  Le texte n'apparaîtra dans la sortie que si sa branche est activée.
- Pour créer une branche, vous utilisez la fenêtre de dialogue 
+ Pour créer une branche, 
+\lang english
+either select the menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Branch\SpecialChar \menuseparator
+Insert New Branch
+\family default
+ (if you just want to specify a new branch), 
+\lang french
+ou utilisez la fenêtre de dialogue 
 \family sans
 Document\SpecialChar \menuseparator
 Paramètres
@@ -29495,6 +29505,23 @@ Branches
 .
  Le nom de la branche, son état d'activation et la couleur de fond qui sert
  à la distinguer dans le document peuvent être modifiés dans cette fenêtre.
+ 
+\lang english
+Furthermore, the dialog lets you merge two branches (just rename one branch
+ to the name of the other) and to add 
+\begin_inset Quotes eld
+\end_inset
+
+unknown branches
+\begin_inset Quotes erd
+\end_inset
+
+ (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e., branches that were added to the document via copy and paste from other
+ documents, without having being defined) to the document's branch list.
 \end_layout
 
 \begin_layout Standard
@@ -29548,6 +29575,106 @@ Réponse: Wilhelm Conrad Röntgen
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+If you activate 
+\family sans
+Filename Suffix
+\family default
+ in 
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Branches
+\family default
+, the name of the active branches will be appended to the file name at export.
+ Consider for example a file 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.lyx
+\begin_inset Quotes erd
+\end_inset
+
+ which has the above branches.
+ If 
+\begin_inset Quotes eld
+\end_inset
+
+Filename Suffix
+\begin_inset Quotes erd
+\end_inset
+
+ is active, the PDF export file would be called 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch were inactive, 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, likewise 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, and 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both branches were active.
+ This helps you to easily export different versions of your document without
+ much hassle.
+\end_layout
+
 \begin_layout Standard
 \begin_inset VSpace bigskip
 \end_inset
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 702b2e8c89..12c38a0923 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -36030,8 +36030,46 @@ name "sec:派生枝"
 \end_layout
 
 \begin_layout Standard
-このような場合に、LyXでは、文を派生枝に分けて置いておくことができます。すると当該文は、その派生枝が有効にされたときのみ出力に現れるようになります。派生枝を作
-成するには、
+このような場合に、LyXでは、文を派生枝に分けて置いておくことができます。すると当該文は、その派生枝が有効にされたときのみ出力に現れるようになります。
+\lang english
+To create a branch, either select the menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Branch\SpecialChar \menuseparator
+Insert New Branch
+\family default
+ (if you just want to specify a new branch) or go in the 
+\family sans
+Document\SpecialChar \menuseparator
+Settings
+\family default
+ dialog to 
+\family sans
+Branches
+\family default
+, where you can specify and change the name of the branch, its activation
+ state (whether the content of the branch is shown in the output or not),
+ its background color inside LyX and whether the name of the branch should
+ be appended to the document file name on export if the branch is active
+ (see below for an example).
+ Furthermore, the dialog lets you merge two branches (just rename one branch
+ to the name of the other) and to add 
+\begin_inset Quotes eld
+\end_inset
+
+unknown branches
+\begin_inset Quotes erd
+\end_inset
+
+ (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e., branches that were added to the document via copy and paste from other
+ documents, without having being defined) to the document's branch list.
+
+\lang japanese
+ 派生枝を作成するには、
 \family sans
 文書\SpecialChar \menuseparator
 設定
@@ -36093,6 +36131,108 @@ ontgenです。
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+If you activate 
+\family sans
+Filename Suffix
+\family default
+ in 
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Branches
+\family default
+, the name of the active branches will be appended to the file name at export.
+ Consider for example a file 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.lyx
+\begin_inset Quotes erd
+\end_inset
+
+ which has the above branches.
+ If 
+\begin_inset Quotes eld
+\end_inset
+
+Filename Suffix
+\begin_inset Quotes erd
+\end_inset
+
+ is active, the PDF export file would be called 
+\begin_inset Quotes eld
+\end_inset
+
+Exam.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch were inactive, 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Question
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, likewise 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if only the 
+\begin_inset Quotes eld
+\end_inset
+
+Answer
+\begin_inset Quotes erd
+\end_inset
+
+ branch was active, and 
+\begin_inset Quotes eld
+\end_inset
+
+Exam-Question-Answer.pdf
+\begin_inset Quotes erd
+\end_inset
+
+ if both branches were active.
+ This helps you to easily export different versions of your document without
+ much hassle.
+\lang japanese
+
 \begin_inset VSpace bigskip
 \end_inset
 
-- 
2.39.2