From: Uwe Stöhr <uwestoehr@web.de>
Date: Sun, 19 Feb 2012 04:18:27 +0000 (+0000)
Subject: - UserGuide.lyx: unify label prefixes, remove an unused label and clarify how to... 
X-Git-Tag: 2.0.3~3
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1a2015e1811f555c233394aa7de617c93fb002a8;p=features.git

- UserGuide.lyx: unify label prefixes, remove an unused label and clarify how to reference a float as discussed in # 8044)
- Spanish UserGuide.lyx: fix a broken cross-reference
- German UserGuide.lyx: some translations
- GleitobjektQt4.png: better screenshot and with smaller file size

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40777 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 270272ebf9..c6b656c917 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -7385,7 +7385,7 @@ status collapsed
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Paragraph-in-the"
+name "fig:Paragraph-in-the"
 
 \end_inset
 
@@ -7427,7 +7427,7 @@ book
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Paragraph-in-the"
+reference "fig:Paragraph-in-the"
 
 \end_inset
 
@@ -10017,7 +10017,7 @@ Horizontal Space
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Units-available-in"
+reference "chap:Units-available-in"
 
 \end_inset
 
@@ -10169,13 +10169,6 @@ arg   "space-insert thin"
 
 \begin_layout Subsubsection
 More Spaces
-\begin_inset CommandInset label
-LatexCommand label
-name "sub:More-Spaces"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -11108,7 +11101,7 @@ Custom
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Units-available-in"
+reference "chap:Units-available-in"
 
 \end_inset
 
@@ -17358,7 +17351,7 @@ Graphics
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Units-available-in"
+reference "chap:Units-available-in"
 
 \end_inset
 
@@ -21234,7 +21227,7 @@ Figure
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Platypus"
+reference "fig:Platypus-distorted"
 
 \end_inset
 
@@ -21307,7 +21300,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Platypus"
+name "fig:Platypus-distorted"
 
 \end_inset
 
@@ -21326,19 +21319,7 @@ A severely distorted platypus in a float.
 
 \begin_layout Standard
 This figure float also shows how to set a label and create a cross-reference
- to it.
- As described in section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Cross-References"
-
-\end_inset
-
-, you can simply insert a label in the caption using the menu 
+ to it: Insert a label into the caption using the menu 
 \family sans
 Insert\SpecialChar \menuseparator
 Label
@@ -21380,6 +21361,18 @@ above
 \end_inset
 
  at all.
+ For more about cross-references, see section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Cross-References"
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
@@ -22076,7 +22069,7 @@ status collapsed
 
 \begin_inset CommandInset label
 LatexCommand label
-name "cha:Mathematical-Formulas"
+name "chap:Mathematical-Formulas"
 
 \end_inset
 
@@ -23174,7 +23167,7 @@ a
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Accent-names-and"
+reference "tab:Accent-names-and"
 
 \end_inset
 
@@ -23193,7 +23186,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Accent-names-and"
+name "tab:Accent-names-and"
 
 \end_inset
 
@@ -24555,7 +24548,7 @@ arg   "math-insert \\font"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Typefaces-and-the"
+reference "tab:Typefaces-and-the"
 
 \end_inset
 
@@ -24574,7 +24567,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Typefaces-and-the"
+name "tab:Typefaces-and-the"
 
 \end_inset
 
@@ -26384,7 +26377,7 @@ Appendix
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Credits"
+reference "chap:Credits"
 
 \end_inset
 
@@ -33116,7 +33109,7 @@ Table
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:The-latin1-character"
+reference "tab:The-latin1-character"
 
 \end_inset
 
@@ -33174,7 +33167,7 @@ status collapsed
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:The-latin1-character"
+name "tab:The-latin1-character"
 
 \end_inset
 
@@ -38905,7 +38898,7 @@ reference "sec:Tables"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Mathematical-Formulas"
+reference "chap:Mathematical-Formulas"
 
 \end_inset
 
@@ -39455,7 +39448,7 @@ Inserts math constructs that are explained in chapter
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Mathematical-Formulas"
+reference "chap:Mathematical-Formulas"
 
 \end_inset
 
@@ -45826,7 +45819,7 @@ inch, see Appendix
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cha:Units-available-in"
+reference "chap:Units-available-in"
 
 \end_inset
 
@@ -47915,7 +47908,7 @@ Units
 
 \begin_inset CommandInset label
 LatexCommand label
-name "cha:Units-available-in"
+name "chap:Units-available-in"
 
 \end_inset
 
@@ -47926,7 +47919,7 @@ name "cha:Units-available-in"
 To understand the units described in this documentation, 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Units"
+reference "tab:Units"
 
 \end_inset
 
@@ -47946,7 +47939,7 @@ status collapsed
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Units"
+name "tab:Units"
 
 \end_inset
 
@@ -48456,7 +48449,7 @@ em)
 Credits
 \begin_inset CommandInset label
 LatexCommand label
-name "cha:Credits"
+name "chap:Credits"
 
 \end_inset
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 02fc9f5295..29b0ca5723 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -22111,14 +22111,9 @@ Einführung
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-A 
-\lang ngerman
-Gleitobjekt
+Ein Gleitobjekt ist ein Textblock 
 \lang english
- is a block of text associated with some sort of label, which doesn't have
- a fixed location.
+associated with some sort of label, which doesn't have a fixed location.
  It can 
 \begin_inset Quotes gld
 \end_inset
@@ -22128,24 +22123,19 @@ gleiten
 \end_inset
 
  forward or backward a page or two, to wherever it fits best.
+
+\lang ngerman
  
 \family sans
-Footnotes
+Fußnoten
 \family default
- and 
+ und 
 \family sans
-Margin
-\begin_inset space ~
-\end_inset
-
-Notes
+Randnotizen
 \family default
- are also 
-\lang ngerman
-Gleitobjekt
+ sind ebenfalls Gleitobjekte, da 
 \lang english
-e, because they can float to the next page when there are too many notes
- on the page.
+they can float to the next page when there are too many notes on the page.
 \end_layout
 
 \begin_layout Standard
@@ -22391,19 +22381,7 @@ Ein verzerrtes Schnabeltier in einem Gleitobjekt.
 
 \begin_layout Standard
 Dieses Abbildungs-Gleitobjekt zeigt außerdem, wie man eine Marke einfügt
- und diese referenziert.
- Wie in Abschnitt
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Querverweise"
-
-\end_inset
-
- beschrieben, kann man einfach eine Marke in die Beschriftung übder das
+ und diese referenziert: Man fügt eine Marke in die Beschriftung über das
  Menü 
 \family sans
 Einfügen\SpecialChar \menuseparator
@@ -22415,7 +22393,7 @@ type  "icon"
 arg   "label-insert"
 \end_inset
 
- einfügen und darauf mit dem Menü 
+ ein und verweist darauf mit dem Menü 
 \family sans
 Einfügen\SpecialChar \menuseparator
 Querverweis
@@ -22426,7 +22404,7 @@ type  "icon"
 arg   "dialog-show-new-inset ref"
 \end_inset
 
- verweisen.
+.
  Es ist wichtig Querverweise für Abbildungs-Gleitobjekte zu verwenden, und
  nicht vage Formulierungen wie 
 \begin_inset Quotes gld
@@ -22446,30 +22424,27 @@ obig
 \end_inset
 
  sein muss.
+ Für mehr über Querverweise siehe Abschnitt
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Querverweise"
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-Normally only one image is inserted in a 
-\lang ngerman
-Abbildungs-Gleitobjekt
-\lang english
-, but sometimes you might want to use two images with separate subcaptions.
- This can be done by inserting 
-\lang ngerman
-Abbildungs-Gleitobjekte
-\lang english
- into existing 
-\lang ngerman
-Abbildungs-Gleitobjekt
-\lang english
-e.
- Note that only the main caption of the 
-\lang ngerman
-Gleitobjekts
-\lang english
- is added to the List of Figures as described in Abschnitt
+Normalerweise wird nur ein Bild in ein Abbildungs-Gleitobjekt eingefügt
+ aber manchmal will man zwei Bilder mit eigenen Beschriftungen haben.
+ Dies wird erreicht, indem man ein Abbildungs-Gleitobjekt in ein existierendes
+ Abbildungs-Gleitobjekt einfügt.
+ Dabei ist zu beachten, dass nur die Hauptbeschriftung des Gleitobjekts
+ in die Liste der Abbildungen, wie in Abschnitt
 \begin_inset space ~
 \end_inset
 
@@ -22480,7 +22455,7 @@ reference "sec:Verzeichnisse"
 
 \end_inset
 
-.
+ beschrieben, eingefügt wird.
  Abbildung
 \begin_inset space ~
 \end_inset
@@ -22492,12 +22467,8 @@ reference "fig:Zwei-verzerrte-Bilder"
 
 \end_inset
 
- is an example of a 
-\lang ngerman
-Abbildungs-Gleitobjekts
-\lang english
- with two images set side by side.
- You can also set the images one below the other.
+ ist ein Beispiel eines Abbildungs-Gleitobjekts mit zwei Bildern nebeneinander.
+ Man kann die Bilder auch untereinander setzen.
  Abbildung
 \begin_inset space ~
 \end_inset
@@ -22516,7 +22487,7 @@ reference "fig:Schnabeltier"
 
 \end_inset
 
- are the subfigures.
+ sind die Untergleitobjekte.
 \end_layout
 
 \begin_layout Standard
@@ -22651,15 +22622,11 @@ Gleitobjekte ! Tabelle
 \end_layout
 
 \begin_layout Standard
-Tabellen-Gleitobjekt
-\lang english
-e
-\lang ngerman
- können über das Menü 
+Tabellen-Gleitobjekte können über das Menü 
 \family sans
 Einfügen\SpecialChar \menuseparator
-Float\SpecialChar \menuseparator
-Table
+Gleitobjekt\SpecialChar \menuseparator
+Tabelle
 \family default
  oder dem Werkzeugleistenknopf 
 \begin_inset Info
@@ -22842,14 +22809,9 @@ Gleitobjekte ! Details
 \end_layout
 
 \begin_layout Standard
-LyX 
-\lang english
-offers you further float types as well as rotated floats.
- It also allows you to change the float numbering scheme, to control the
- float placement and to change the formatting and placement of the float
- caption.
-
-\lang ngerman
+LyX unterstützt weitere Gleitojekt-Typen und auch rotierte Gleitobjekte.
+ Des Weiteren kann das Nummerierungsschema, die Gleitobjekt-Platzierung
+ und die Formatierung der Beschriftung geändert werden.
  All diese Features sind im Detail in Kapitel 
 \emph on
 Gleitobjekte
@@ -23911,13 +23873,6 @@ mathematische!Symbole
 \end_inset
 
 
-\begin_inset CommandInset label
-LatexCommand label
-name "sub:Mathe-Symbole"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -23973,25 +23928,16 @@ Leerraum ändern
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-You may want to create spaces that differ from the standard spacing that
- LaTeX provides.
- To do this, press 
+Will man Leerraum erzeugen, der sich von LaTeXs Standard-Leerraum unterscheidet,
+ drückt man 
 \family sans
-\lang ngerman
 Strg+Leertaste
 \family default
-\lang english
- or use the 
+ oder den 
 \family sans
-Math
-\begin_inset space ~
-\end_inset
-
-Panel
+Mathe
 \family default
- button 
+ Werkzeugleistenknopf 
 \family sans
 
 \begin_inset Info
@@ -24002,8 +23948,8 @@ arg   "math-insert \\space"
 
 \family default
 .
- This generates a small space, and shows a small marker on the screen.
- For example, the sequence 
+ Dies erzeugt einen kleinen Leerraum mit einer Marke zur Visualisierung.
+ Zum Beispiel erscheint die Sequenz 
 \series bold
 a Strg+Leertaste b
 \series default
@@ -24011,19 +23957,19 @@ a Strg+Leertaste b
 \begin_inset Formula $a\, b$
 \end_inset
 
- appears in LyX as 
+ in LyX als 
 \begin_inset Graphics
 	filename ../clipart/SpaceMarker.png
 
 \end_inset
 
 .
- You can change the space to different sizes when you set the cursor behind
- the space marker and hit space again several times.
- With every space hit the size will be changed.
- Some markers for the space size appear red in LyX, because they are negative
- spaces.
- Here are two examples:
+ Man kann verschiedenen Größen für den Leerraum anwählen, indem man den
+ Cursor hinter die Marke setzt und mehrfach die Leertaste drückt.
+ Mit jedem Drücken der Leertaste wird die Größe verändert.
+ Die Marke erscheint für einige Größen rot, da diese Größen negativen Leerraum
+ darstellen.
+ Hier sind zwei Beispiele:
 \end_layout
 
 \begin_layout Standard
@@ -25981,13 +25927,6 @@ x & \textrm{wenn ich es sage}\\
 
 \begin_layout Subsection
 Schriftgrößen
-\begin_inset CommandInset label
-LatexCommand label
-name "sub:Schriftgrößen-Mathe"
-
-\end_inset
-
-
 \begin_inset Index idx
 status collapsed
 
@@ -29368,10 +29307,10 @@ Index of Names
 
  next to the standard index.
  LaTeX does not provide this possibility out of the box, but there are many
- packages that add this feature.
- LyX uses the
+ packages that add this feature
 \lang ngerman
- 
+.
+ LyX verwendet das LaTeX-Paket 
 \series bold
 splitidx
 \series default
@@ -29385,10 +29324,10 @@ LaTeX-Paket ! splitidx
 
 \end_inset
 
- 
+ um mehrere Stichwortverzeichnisse zu erzeugen.
+ Dieses Paket ist 
 \lang english
-package to generate multiple indexes.
- The package is included in all recent LaTeX distributions.
+included in all recent LaTeX distributions.
  If yours does not ship it, consult
 \lang ngerman
  den TeX-Katalog, 
diff --git a/lib/doc/de/clipart/GleitobjektQt4.png b/lib/doc/de/clipart/GleitobjektQt4.png
index 99c05d393c..0f763890de 100644
Binary files a/lib/doc/de/clipart/GleitobjektQt4.png and b/lib/doc/de/clipart/GleitobjektQt4.png differ
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index c947528158..13f256c885 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -3503,7 +3503,7 @@ LaTeX, paquetes ! fancyhdr
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Customized-Page-Headers"
+reference "sec:Encabezados-personalizados"
 
 \end_inset
 
@@ -7664,7 +7664,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Párrafo-en"
+name "fig:Párrafo-en"
 
 \end_inset
 
@@ -7704,7 +7704,7 @@ book
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Párrafo-en"
+reference "fig:Párrafo-en"
 
 \end_inset
 
@@ -10398,13 +10398,6 @@ Ctrl+Mayúsculas+Espacio
 
 \begin_layout Subsubsection
 Otros espacios
-\begin_inset CommandInset label
-LatexCommand label
-name "sub:Otros-espacios"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -21653,7 +21646,7 @@ La figura
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Ornitorrinco"
+reference "fig:Ornitorrinco-distorsionado"
 
 \end_inset
 
@@ -21723,7 +21716,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Ornitorrinco"
+name "fig:Ornitorrinco-distorsionado"
 
 \end_inset
 
@@ -21742,19 +21735,7 @@ Un ornitorrinco muy distorsionado en un flotante.
 
 \begin_layout Standard
 Estas figuras flotantes también muestran cómo poner una etiqueta y crear
- una referencia a ella.
- Como se describe en la sección
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Referencias-cruzadas"
-
-\end_inset
-
-, puedes insertar una etiqueta en el título con el menú 
+ una referencia a ella: Inserta una etiqueta en el título con el menú 
 \family sans
 Insertar\SpecialChar \menuseparator
 Etiqueta 
@@ -21765,7 +21746,7 @@ type  "icon"
 arg   "label-insert"
 \end_inset
 
- y hacer referencia a ella con el menú 
+ y haga referencia a ella con el menú 
 \family sans
 Insertar\SpecialChar \menuseparator
 Referencia
@@ -21785,6 +21766,18 @@ arg   "dialog-show-new-inset ref"
  alusiones como «la figura de arriba», debido a que LaTeX recolocará los
  flotantes en el documento final, y entonces la figura podría no quedar
  «arriba» precisamente.
+ Para más sobre referencias cruzadas, véase la sección
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Referencias-cruzadas"
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
@@ -23684,7 +23677,7 @@ a
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Acentos-y-comandos"
+reference "tab:Acentos-y-comandos"
 
 \end_inset
 
@@ -23703,7 +23696,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Acentos-y-comandos"
+name "tab:Acentos-y-comandos"
 
 \end_inset
 
@@ -25079,7 +25072,7 @@ Paneles de ecuaciones
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Estilos-del-texto-y"
+reference "tab:Estilos-del-texto-y"
 
 \end_inset
 
@@ -25098,7 +25091,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Estilos-del-texto-y"
+name "tab:Estilos-del-texto-y"
 
 \end_inset
 
@@ -30413,6 +30406,13 @@ Roman{page}
 
 \begin_layout Section
 Encabezados y pies de página personalizados
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Encabezados-personalizados"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
@@ -33439,7 +33439,7 @@ El cuadro
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Mapa-de-caracteres-latin1"
+reference "tab:Mapa-de-caracteres-latin1"
 
 \end_inset
 
@@ -33501,7 +33501,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Mapa-de-caracteres-latin1"
+name "tab:Mapa-de-caracteres-latin1"
 
 \end_inset
 
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 8719e58949..a4f387708f 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -10712,13 +10712,6 @@ arg   "space-insert thin"
 
 \begin_layout Subsubsection
 Encore plus d'espaces
-\begin_inset CommandInset label
-LatexCommand label
-name "sub:Encore-plus-d'espaces"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -22259,7 +22252,7 @@ La figure
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Ornithorinque"
+reference "fig:Ornithorinque"
 
 \end_inset
 
@@ -22328,7 +22321,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Ornithorinque"
+name "fig:Ornithorinque"
 
 \end_inset
 
@@ -22347,25 +22340,13 @@ Un ornithorynque sévèrement déformé dans un flottant de figure.
 
 \begin_layout Standard
 Ce flottant de figure montrent aussi comment ajouter une étiquette et créer
- une référence croisée pointant sur elle.
- Comme c'est décrit dans la section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Références-croisées"
-
-\end_inset
-
-, vous pouvez simplement insérer une étiquette dans la légende à l'aide
- du menu 
+ une référence croisée pointant sur elle : Insérez-vous une étiquette dans
+ la légende à l'aide du menu 
 \family sans
 Insérer\SpecialChar \menuseparator
 Étiquette
 \family default
- ou le bouton
+ ou le bouton 
 \begin_inset Info
 type  "icon"
 arg   "label-insert"
@@ -22406,7 +22387,22 @@ ci-dessous
 \begin_inset Quotes frd
 \end_inset
 
- du tout !
+ du tout ! 
+\lang english
+For more about cross-references, see
+\lang french
+ section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Références-croisées"
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
@@ -22434,7 +22430,7 @@ reference "sub:Liste-des-figures,"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -22563,7 +22559,7 @@ Ornithorynque
 Deux images déformées.
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Deux-images-déformées."
+name "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -22624,7 +22620,7 @@ arg   "float-insert table"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Flottant-de-tableau"
+reference "tab:Flottant-de-tableau"
 
 \end_inset
 
@@ -22643,7 +22639,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Flottant-de-tableau"
+name "tab:Flottant-de-tableau"
 
 \end_inset
 
@@ -25470,7 +25466,7 @@ arg   "math-insert \\font"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Polices-et-commandes"
+reference "tab:Polices-et-commandes"
 
 \end_inset
 
@@ -25489,7 +25485,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Polices-et-commandes"
+name "tab:Polices-et-commandes"
 
 \end_inset
 
@@ -26654,7 +26650,7 @@ Il y six variétés de références croisées:
 <référence> affiche le numéro de l'élément, c'est le choix implicite:
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -26690,7 +26686,7 @@ reference "eq:tanhExp"
 
 \begin_inset CommandInset ref
 LatexCommand pageref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -26713,7 +26709,7 @@ page
  suivi du numéro de la page sur laquelle se trouve l'élément:
 \begin_inset CommandInset ref
 LatexCommand vpageref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -26740,7 +26736,7 @@ page
  et le numéro de la page:
 \begin_inset CommandInset ref
 LatexCommand vref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -26932,7 +26928,7 @@ textuelle affiche la contenu de la légende ou le nom de la référence, par
  exemple un titre de section: 
 \begin_inset CommandInset ref
 LatexCommand nameref
-reference "cap:Deux-images-déformées."
+reference "fig:Deux-images-déformées."
 
 \end_inset
 
@@ -34697,7 +34693,7 @@ Le tableau
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Alphabet-latin1"
+reference "tab:Alphabet-latin1"
 
 \end_inset
 
@@ -34756,7 +34752,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Alphabet-latin1"
+name "tab:Alphabet-latin1"
 
 \end_inset
 
@@ -37515,7 +37511,7 @@ La liste suivante reprend tous les caractères accentués qui peuvent être
  
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Alphabet-latin1"
+reference "tab:Alphabet-latin1"
 
 \end_inset
 
@@ -48272,7 +48268,7 @@ Pour comprendre les unités de longueur utilisées dans cette documentation,
  le tableau 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:Unités"
+reference "tab:Unités"
 
 \end_inset
 
@@ -48292,7 +48288,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:Unités"
+name "tab:Unités"
 
 \end_inset
 
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 5edf5fa9e5..12a28e95f2 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -11529,7 +11529,6 @@ status open
 \align center
 \begin_inset Graphics
 	filename ../clipart/Abstract.pdf
-	lyxscale 25
 
 \end_inset
 
@@ -11542,7 +11541,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:概要環境内の段落"
+name "fig:概要環境内の段落"
 
 \end_inset
 
@@ -11594,7 +11593,7 @@ name "cap:概要環境内の段落"
 環境の例を見せたいのですが、この取扱説明書が「book」クラスなのでできません。したがって第
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:概要環境内の段落"
+reference "fig:概要環境内の段落"
 
 \end_inset
 
@@ -28416,7 +28415,7 @@ Figure
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:カモノハシ"
+reference "fig:カモノハシ-1"
 
 \end_inset
 
@@ -28503,7 +28502,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:カモノハシ"
+name "fig:カモノハシ-1"
 
 \end_inset
 
@@ -28530,7 +28529,7 @@ name "cap:カモノハシ"
 \bar no
 \noun off
 \color none
-この図フロートは、ラベルの付け方と相互参照の作り方も示しています。第
+この図フロートは、ラベルの付け方と相互参照の作り方も示しています
 \family default
 \series default
 \shape default
@@ -28539,14 +28538,19 @@ name "cap:カモノハシ"
 \bar default
 \noun default
 \color inherit
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:相互参照"
-
+\lang english
+: Insert a label into the caption using the menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Label
+\family default
+ or the toolbar button 
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
-
+ and refer to it using the menu 
 \family roman
 \series medium
 \shape up
@@ -28555,8 +28559,9 @@ reference "sec:相互参照"
 \bar no
 \noun off
 \color none
-節で説明されているように、キャプション
-\family default
+\lang japanese
+を使ってラベルを挿入し、
+\family sans
 \series default
 \shape default
 \size default
@@ -28564,10 +28569,8 @@ reference "sec:相互参照"
 \bar default
 \noun default
 \color inherit
-に
-\family sans
 挿入\SpecialChar \menuseparator
-ラベル
+相互参照
 \family roman
 \series medium
 \shape up
@@ -28576,7 +28579,7 @@ reference "sec:相互参照"
 \bar no
 \noun off
 \color none
-メニュー
+を使って参照します
 \family default
 \series default
 \shape default
@@ -28586,17 +28589,17 @@ reference "sec:相互参照"
 \noun default
 \color inherit
 \lang english
- or the toolbar button
+ or the toolbar button 
 \lang japanese
- 
+
 \begin_inset Info
 type  "icon"
-arg   "label-insert"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
- 
+
 \lang english
-and refer to it using the menu
+ 
 \family roman
 \series medium
 \shape up
@@ -28606,26 +28609,8 @@ and refer to it using the menu
 \noun off
 \color none
 \lang japanese
- を使ってラベルを挿入し、
-\family sans
-\series default
-\shape default
-\size default
-\emph default
-\bar default
-\noun default
-\color inherit
-挿入\SpecialChar \menuseparator
-相互参照
-\family roman
-\series medium
-\shape up
-\size normal
-\emph off
-\bar no
-\noun off
-\color none
-を使って参照します
+。図フロートを参照する場合には、「上図」のようにあいまいな参照をするのではなく、相互参照を使用することが重要です。LaTeXは、文書の最終版でフロートの再配置を
+行うため、図が「上」に来るかどうかはまったくもって定かではないからです。
 \family default
 \series default
 \shape default
@@ -28635,25 +28620,22 @@ and refer to it using the menu
 \noun default
 \color inherit
 \lang english
- or the toolbar button
+ For more about cross-references, see section
+\begin_inset space ~
+\end_inset
+
+
 \lang japanese
- 
-\begin_inset Info
-type  "icon"
-arg   "dialog-show-new-inset ref"
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:相互参照"
+
 \end_inset
 
 
-\family roman
-\series medium
-\shape up
-\size normal
-\emph off
-\bar no
-\noun off
-\color none
-。図フロートを参照する場合には、「上図」のようにあいまいな参照をするのではなく、相互参照を使用することが重要です。LaTeXは、文書の最終版でフロートの再配置を
-行うため、図が「上」に来るかどうかはまったくもって定かではないからです。
+\lang english
+.
 \end_layout
 
 \begin_layout Standard
@@ -28836,7 +28818,7 @@ arg   "float-insert table"
  うと挿入することができます。表フロートは、ラベルが異なることを除けば、図フロートと同じです。表
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:表フロート"
+reference "tab:表フロート"
 
 \end_inset
 
@@ -28865,7 +28847,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:表フロート"
+name "tab:表フロート"
 
 \end_inset
 
@@ -40871,7 +40853,7 @@ status collapsed
 第
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:latin1文字セット"
+reference "tab:latin1文字セット"
 
 \end_inset
 
@@ -40920,7 +40902,7 @@ status collapsed
 第
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:latin1文字セット"
+reference "tab:latin1文字セット"
 
 \end_inset
 
@@ -40941,7 +40923,7 @@ status collapsed
 第
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:latin1文字セット"
+reference "tab:latin1文字セット"
 
 \end_inset
 
@@ -40965,7 +40947,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:latin1文字セット"
+name "tab:latin1文字セット"
 
 \end_inset
 
@@ -43719,7 +43701,7 @@ o
 以下は、LyXが直接表示することができるアクセント付き文字の全一覧です。これには、第
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:latin1文字セット"
+reference "tab:latin1文字セット"
 
 \end_inset
 
@@ -52641,7 +52623,7 @@ status collapsed
 この文書で用いられる単位の理解のために、表
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "cap:単位"
+reference "tab:単位"
 
 \end_inset
 
@@ -52661,7 +52643,7 @@ status open
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "cap:単位"
+name "tab:単位"
 
 \end_inset