The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit d90bcd1f5a38e5e1e4dab82d7fbf310b9ce2a4ce
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sat Jun 2 02:09:36 2012 +0200

    - UserGuide.lyx: adapt style of description of split indexes (the feature 
is btw. currently broken)
    - German UserGuide.lyx: some further translations
    - Japanese UserGuide.lyx: add missing section about split indexes

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index a2aa799..19bd39d 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -27922,7 +27922,11 @@ LaTeX-packages ! splitidx
 
  package to generate multiple indexes.
  The package is included in all recent LaTeX distributions.
- If yours does not ship it, consult the TeX-catalogue, 
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+If yours does not ship it, consult the TeX-catalogue, 
 \begin_inset CommandInset citation
 LatexCommand cite
 key "TeXCatalogue"
@@ -27935,6 +27939,11 @@ key "TeXCatalogue"
  Please consult the package's manual for details.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 To set up LyX for the use of multiple indexes, go to 
 \family sans
@@ -27942,55 +27951,37 @@ Document\SpecialChar \menuseparator
 Settings\SpecialChar \menuseparator
 Indexes
 \family default
- and select 
-\begin_inset Quotes eld
-\end_inset
-
+ and select the option 
+\family sans
 Use multiple Indexes
-\begin_inset Quotes erd
-\end_inset
-
+\family default
 .
- Note that the list of 
+ Note that the list 
+\family sans
+Available Indexes
+\family default
+ already contains the standard index 
 \begin_inset Quotes eld
 \end_inset
 
-Available Indexes
+Index
 \begin_inset Quotes erd
 \end_inset
 
- below already contains the standard index.
+.
  To add further indexes, add the name of the index (in the form that should
  also appear as a heading) to the 
-\begin_inset Quotes eld
-\end_inset
-
+\family sans
 New
-\begin_inset Quotes erd
-\end_inset
-
+\family default
  input field and press the 
-\begin_inset Quotes eld
-\end_inset
-
+\family sans
 Add
-\begin_inset Quotes erd
-\end_inset
-
- button.
- The new index should now appear in the list as well.
- If you like, you can attribute an alternative label color to the new index
- by selecting the index in the list and hitting the 
-\begin_inset Quotes eld
-\end_inset
-
-Alter Color
-\begin_inset Quotes erd
-\end_inset
-
+\family default
  button.
- The label color may help you to differentiate between index entries of
- different indexes in the LyX work area.
+ The new index now also appears in the list.
+ If you like, you can attribute an alternative LyX label color to the new
+ index.
 \end_layout
 
 \begin_layout Standard
@@ -28012,19 +28003,19 @@ TOC
 \family sans
 Insert
 \family default
- menu has a separate index entry for each of the defined indexes.
+ menu has a separate entry for each of the defined indexes.
  The workflow is basically the same as for the default index, but there
- are some additional features:
+ are additional features:
 \end_layout
 
 \begin_layout Itemize
 If you want to change the attribution of a specific index entry, right-clicking
- on the entry will open a dialog where you can do that.
+ on the entries' label will open a dialog where you can do that.
 \end_layout
 
 \begin_layout Itemize
 By right-clicking on an index, you can change its type.
- Furthermore, you can specify an index list to be a 
+ Furthermore, you can specify an index to be a 
 \begin_inset Quotes eld
 \end_inset
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 3d73c39..103ec22 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -28878,7 +28878,11 @@ LaTeX-Paket ! splitidx
 
  um mehrere Stichwortverzeichnisse zu erzeugen.
  Dieses Paket ist in allen aktuellen LaTeX-Distributionen enthalten.
- Falls Ihre Distribution es nicht anbietet, konsultieren Sie den TeX-Katalog,
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Falls Ihre Distribution es nicht anbietet, konsultieren Sie den TeX-Katalog,
  
 \begin_inset CommandInset citation
 LatexCommand cite
@@ -28893,6 +28897,11 @@ key "TeX-Katalog"
  Lesen Sie die Dokumentation des Pakets für weitere Informationen.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Um LyX für mehrere Stichwortverzeichnisse einzurichten, gehen Sie ins Menü
  
@@ -28901,67 +28910,46 @@ Dokument\SpecialChar \menuseparator
 Einstellungen\SpecialChar \menuseparator
 Stichwortverzeichnis
 \family default
- und aktivieren 
-\begin_inset Quotes gld
-\end_inset
-
+ und aktivieren die Option 
+\family sans
 Mehrere Indexe verwenden
-\begin_inset Quotes grd
-\end_inset
-
+\family default
 .
- 
-\lang english
-Note that the list of 
+ Wie man sieht, enthält die Liste 
+\family sans
+Verfügbare Indexe
+\family default
+ bereits den Standard-Index 
 \begin_inset Quotes gld
 \end_inset
 
-Verfügbare Indexe
+Stichwortverzeichnis
 \begin_inset Quotes grd
 \end_inset
 
- below already contains the standard index.
- To add further indexes, add the name of the index (in the form that should
- also appear as a heading) to the 
-\begin_inset Quotes eld
-\end_inset
-
-New
-\begin_inset Quotes erd
-\end_inset
-
- input field and press the 
-\begin_inset Quotes eld
-\end_inset
-
-Add
-\begin_inset Quotes erd
-\end_inset
-
- button.
- The new index should now appear in the list as well.
- If you like, you can attribute an alternative label color to the new index
- by selecting the index in the list and hitting the 
-\begin_inset Quotes eld
-\end_inset
-
-Alter Color
-\begin_inset Quotes erd
-\end_inset
-
- button.
- The label color may help you to differentiate index entries of different
- indexes in the LyX work area.
+.
+ Um weitere Indexe hinzuzufügen, geben Sie den Namen des Indexes in das
+ Feld 
+\family sans
+Neuer Index
+\family default
+ ein (in der Form, in der er auch als Überschrift erscheinen soll) und 
drücken
+ 
+\family sans
+Hinzufügen
+\family default
+.
+ Der neue Index erscheint nun auch in der Liste.
+ Sie können dem neuen Index auch eine alternative Farbe für dessen 
Einfügungen
+ in LyX zuweisen.
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-Once the Dokument changes have been applied, you can find the new index
- list in 
+Sobald die Änderungen übernommen wurden, findet man den neuen Index im Menü
+ 
 \family sans
 Einfügen\SpecialChar \menuseparator
-List
+Liste
 \begin_inset space ~
 \end_inset
 
@@ -28969,45 +28957,42 @@ List
 \begin_inset space ~
 \end_inset
 
-TOC
+Inhaltsverzeichnis
 \family default
- and the 
+ und das Menü 
 \family sans
-Insert
+Einfügen
 \family default
- menu has a separate index entry for each of the defined indexes.
- The workflow is basically the same as for the default index, but there
- are some additional features:
+ hat einen eigenen Eintrag für jeden definierten Index.
+ Das Arbeiten mit neuen Indexen ist im Prinzip dasselbe wie mit dem 
Stichwortver
+zeichnis aber es gibt zusätzliche Funktionen:
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-If you want to change the attribution of a specific index entry, right-clicking
- on the entry will open a dialog where you can do that.
+Wenn Sie die Index-Zuweisung eines Indexeintrags ändern wollen, klicken
+ die mit Rechts auf die Marke des Eintrags.
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-By right-clicking on an index, you can change its type.
- Furthermore, you can specify an index list to be a 
+Durch Rechtsklicken auf einen Index kann man dessen Typ ändern.
+ Man kann des weiteren einen Index als 
 \begin_inset Quotes gld
 \end_inset
 
-Subindex
+Unterindex
 \begin_inset Quotes grd
 \end_inset
 
-.
- If you do that, the heading of that list will be decreased by one level.
- E.
+ verwenden.
+ Wenn man das macht, wird die Überschrift des Indexes um eine Ebene 
verringert.
+ Das bedeutet, dass wenn man z.
 \begin_inset space \thinspace{}
 \end_inset
 
-g., if you use a book class, where the standard index heading is defined
- as a chapter, subindexes will be defined as sections and can thus be nested
- to the non-subindexes.
+B.
+ eine Buch-Dokumentklasse verwendet, in der der Titel des 
Stichwortverzeichnisse
+s als Kapitel definiert ist, der Titels des Unterindex' als Abschnitt definiert
+ wird und daher in Nicht-Unterindexe eingegliedert werden kann.
 \end_layout
 
 \begin_layout Section
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 517f95e..2ddf539 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -28525,7 +28525,11 @@ LaTeX, paquetes ! splitidx
 
  para generar índices múltiples.
  El paquete se incluye en las distribuciones recientes de LaTeX.
- Si no es así consulta TeX Catalogue, 
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Si no es así consulta TeX Catalogue, 
 \begin_inset CommandInset citation
 LatexCommand cite
 key "TeXCatalogue"
@@ -28538,6 +28542,11 @@ key "TeXCatalogue"
  Véase la documentación del paquete para más detalles.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Para configurar el uso de múltiples índices en LyX, hay que seleccionar
  
@@ -28555,38 +28564,27 @@ Configuración\SpecialChar \menuseparator
 \family sans
 Índices disponibles
 \family default
- de abajo ya contiene el índice estándar.
- Para añadir más índices, añade su nombre (en la forma en que deba aparecer
- como encabezado) en el campo 
+ ya contiene el índice estándar 
 \begin_inset Quotes fld
 \end_inset
 
-Nuevo
+Índice
 \begin_inset Quotes frd
 \end_inset
 
+.
+ Para añadir más índices, añade su nombre (en la forma en que deba aparecer
+ como encabezado) en el campo 
+\family sans
+Nuevo
+\family default
  y pulsa el botón 
-\begin_inset Quotes fld
-\end_inset
-
+\family sans
 Añadir
-\begin_inset Quotes frd
-\end_inset
-
-.
- El nuevo índice deberá aparecer ahora en la lista.
- Es posible asignar un color alternativo a la etiqueta del nuevo índice
- seleccionándolo en la lista y pulsando el botón 
-\begin_inset Quotes fld
-\end_inset
-
-Cambiar color...
-\begin_inset Quotes frd
-\end_inset
-
+\family default
 .
- El color de la etiqueta ayuda a diferenciar las entradas de los diferentes
- índices en el área de trabajo de LyX.
+ El nuevo índice aparecerá ahora en la lista.
+ Es posible asignar un color alternativo a la etiqueta LyX del nuevo índice.
 \end_layout
 
 \begin_layout Standard
@@ -28596,6 +28594,14 @@ Una vez aplicados los cambios, encontrarás el nuevo 
índice definido en una
 Insertar\SpecialChar \menuseparator
 Índice
 \family default
+ y el menú 
+\family sans
+Insertar
+\family default
+ tiene 
+\lang english
+a separate entry for each of the defined indexes.
+\lang spanish
 .
  El funcionamiento es básicamente el mismo que el del índice estándar, pero
  tiene algunas características adicionales:
@@ -28603,7 +28609,8 @@ Insertar\SpecialChar \menuseparator
 
 \begin_layout Itemize
 Si quieres cambiar la atribución de una entrada de índice específica, 
haciendo
- clic derecho sobre la entrada abrirá un diálogo donde se puede hacer eso.
+ clic derecho sobre la etiqueta de la entrada abrirá un diálogo donde se
+ puede hacer eso.
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index e0be760..8ae356e 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -29164,7 +29164,11 @@ Paquetages LaTeX ! splitidx
 
  pour créer des index multiples, paquetage inclus dans toutes les 
distributions
  LaTeX récentes.
- Si la vôtre ne l'inclut pas, consultez le catalogue TeX, 
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Si la vôtre ne l'inclut pas, consultez le catalogue TeX, 
 \begin_inset CommandInset citation
 LatexCommand cite
 key "TeXCatalogue"
@@ -29177,6 +29181,11 @@ key "TeXCatalogue"
  Consultez le manuel du paquetage pour les détails.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 La paramétrage de LyX pour l'utilisation de plusieurs index est accessible
  via 
@@ -29185,55 +29194,37 @@ Document\SpecialChar \menuseparator
 Paramètres\SpecialChar \menuseparator
 Index
 \family default
-, en cochant 
-\begin_inset Quotes fld
-\end_inset
-
+, en cochant l'option 
+\family sans
 Utiliser plusieurs index
-\begin_inset Quotes frd
-\end_inset
-
+\family default
 .
- Noter que le liste des 
+ Noter que le liste 
+\family sans
+Index disponibles
+\family default
+ contient implicitement l'index standard 
 \begin_inset Quotes fld
 \end_inset
 
-Index disponibles
+Index
 \begin_inset Quotes frd
 \end_inset
 
- contient implicitement l'index standard.
+.
  Pour ajouter d'autres index, ajouter un nom d'index (tel qu'il devra 
apparaître
  dans l'en-tête) dans le champ 
-\begin_inset Quotes fld
-\end_inset
-
+\family sans
 Nouveau
-\begin_inset Quotes frd
-\end_inset
-
+\family default
  et appuyer sur 
-\begin_inset Quotes fld
-\end_inset
-
+\family sans
 Ajouter
-\begin_inset Quotes frd
-\end_inset
-
+\family default
 .
  Le nouvel index doit apparaître dans la liste.
- Si vous le désirez, vous pouvez attribuer une couleur aux étiquettes 
correspond
-antes en sélectionnant le bouton 
-\begin_inset Quotes fld
-\end_inset
-
-Changer la couleur
-\begin_inset Quotes frd
-\end_inset
-
-.
- La couleur de l'étiquette peut vous aider à reconnaître les entrées 
d'index
- dans la fenêtre LyX.
+ Si vous le désirez, vous pouvez attribuer une couleur LyX aux étiquettes
+ correspondantes.
 \end_layout
 
 \begin_layout Standard
@@ -29263,8 +29254,8 @@ Insérer
 
 \begin_layout Itemize
 si vous voulez changer l'attribution d'une entrée d'index particulière,
- un clic droit sur l'entrée ouvre une fenêtre dans laquelle cette action
- est possible;
+ un clic droit sur l'étiquette de l'entrée ouvre une fenêtre dans laquelle
+ cette action est possible;
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 0e79e5c..97c37c2 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -36332,6 +36332,167 @@ xindy
 を使うことを考慮してみてください。
 \end_layout
 
+\begin_layout Subsection
+
+\lang english
+Multiple Indexes
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+In many fields it is common to have more than one index.
+ For instance, you might need to set up a separate 
+\begin_inset Quotes eld
+\end_inset
+
+Index of Names
+\begin_inset Quotes erd
+\end_inset
+
+ next to the standard index.
+ LaTeX does not provide this possibility out of the box, but there are packages
+ that add this feature.
+ LyX uses the 
+\series bold
+splitidx
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+LaTeX-packages ! splitidx
+\end_layout
+
+\end_inset
+
+ package to generate multiple indexes.
+ The package is included in all recent LaTeX distributions.
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+If yours does not ship it, consult the TeX-catalogue, 
+\begin_inset CommandInset citation
+LatexCommand cite
+key "TeXCatalogue"
+
+\end_inset
+
+.
+ Note that the package does not only consist of a LaTeX style, but it also
+ includes specific preprocessor programs that need to be installed as well.
+ Please consult the package's manual for details.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To set up LyX for the use of multiple indexes, go to 
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Indexes
+\family default
+ and select the option 
+\family sans
+Use multiple Indexes
+\family default
+.
+ Note that the list 
+\family sans
+Available Indexes
+\family default
+ already contains the standard index 
+\begin_inset Quotes eld
+\end_inset
+
+Index
+\begin_inset Quotes erd
+\end_inset
+
+.
+ To add further indexes, add the name of the index (in the form that should
+ also appear as a heading) to the 
+\family sans
+New
+\family default
+ input field and press the 
+\family sans
+Add
+\family default
+ button.
+ The new index now also appears in the list.
+ If you like, you can attribute an alternative LyX label color to the new
+ index.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Once the document changes have been applied, you can find the new index
+ list in 
+\family sans
+Insert\SpecialChar \menuseparator
+List
+\begin_inset space ~
+\end_inset
+
+/
+\begin_inset space ~
+\end_inset
+
+TOC
+\family default
+ and the 
+\family sans
+Insert
+\family default
+ menu has a separate entry for each of the defined indexes.
+ The workflow is basically the same as for the default index, but there
+ are additional features:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+If you want to change the attribution of a specific index entry, right-clicking
+ on the entries' label will open a dialog where you can do that.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+By right-clicking on an index, you can change its type.
+ Furthermore, you can specify an index to be a 
+\begin_inset Quotes eld
+\end_inset
+
+Subindex
+\begin_inset Quotes erd
+\end_inset
+
+.
+ If you do that, the heading of that list will be decreased by one level.
+ E.
+\begin_inset space \thinspace{}
+\end_inset
+
+g., if you use a book class, where the standard index heading is defined
+ as a chapter, subindexes will be defined as sections and can thus be nested
+ to the non-subindexes.
+\end_layout
+
 \begin_layout Section
 記号一覧/用語集
 \begin_inset Index idx

-----------------------------------------------------------------------

Summary of changes:
 lib/doc/UserGuide.lyx    |   71 +++++++++-----------
 lib/doc/de/UserGuide.lyx |  125 ++++++++++++++++--------------------
 lib/doc/es/UserGuide.lyx |   57 +++++++++-------
 lib/doc/fr/UserGuide.lyx |   65 ++++++++-----------
 lib/doc/ja/UserGuide.lyx |  161 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 307 insertions(+), 172 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to