From 8e6e4c28f359682a7eb3a7564ca720a8ae2d8b38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 21 May 2013 23:41:36 +0200
Subject: [PATCH] UserGuide.lyx: backport recent changes to branch

---
 lib/doc/UserGuide.lyx    | 281 ++++++++++++++++++++++++++-------------
 lib/doc/de/UserGuide.lyx | 178 ++++++++++++-------------
 lib/doc/es/UserGuide.lyx | 140 +++++++++++--------
 lib/doc/fr/UserGuide.lyx | 171 ++++++++++++++----------
 lib/doc/ja/UserGuide.lyx | 173 ++++++++++++++++++------
 5 files changed, 597 insertions(+), 346 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index b0c34bee13..8a757198a7 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -23963,25 +23963,28 @@ Keep
 matched
 \family default
 , the selected bracket type will be used for the left and the right side.
- The selection will be shown below the button field.
- If you want one side not to have a bracket, use the blank button.
+ The selection will be shown as TeX code.
+ If you want one side not to have a bracket, use 
+\family sans
+(none)
+\family default
+.
  It will appear in LyX with a dotted line, but nothing will be printed.
 \end_layout
 
 \begin_layout Standard
-If you want to place brackets around math structures, like a square root,
- you can do so by first highlighting (selecting) the structure that is to
- go inside the brackets.
+If you want to place brackets around existing math structures, like a square
+ root, you can do so by first highlighting (selecting) the structure that
+ is to go inside the brackets.
  Then choose the appropriate brackets for left and right and click on 
 \family sans
 Insert
 \family default
 .
- The parentheses will be drawn around the selected structure.
  The most common bracket combinations (parentheses, square brackets, and
  braces, on both sides) can be entered more quickly using keyboard shortcuts.
- For example, to insert a pair of flexible parentheses on both sides, select
- the structure and enter 
+ For example, to insert a pair of parentheses, select the structure and
+ enter 
 \begin_inset Info
 type  "shortcut"
 arg   "math-delim ( )"
@@ -40662,15 +40665,54 @@ Color ! background
 \end_inset
 
 
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Color ! Shaded boxes
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Color ! Greyed-out notes
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
-Here you can alter the font color for the main text (default: black) and
- for Greyed
+Here you can alter the font color for the 
+\family sans
+Main text
+\family default
+ (default: black), for 
+\family sans
+Greyed
+\begin_inset space ~
+\end_inset
+
+out notes
+\family default
+ (default: light grey)for the background color for the 
+\family sans
+Page
+\family default
+ (default: white) and for 
+\family sans
+Shaded
 \begin_inset space ~
 \end_inset
 
-out notes (default: light grey).
+boxes
+\family default
+ (default: red).
  The button 
 \family sans
 Reset
@@ -40679,17 +40721,23 @@ Reset
 \end_layout
 
 \begin_layout Standard
-You can also change the background color for the pages (default: white)
- and for Shaded
-\begin_inset space ~
-\end_inset
-
-boxes (default: red).
+Clicking any button showing 
+\family sans
+Default
+\family default
+ or 
+\family sans
+Change
+\family default
+ opens a dialog enabling you to choose from a selection of colors or from
+ a color-picker or to specify a color using HSL or RGB values.
+ In the dialog you can add any color to the custom colors to select them
+ later more quickly.
 \end_layout
 
 \begin_layout Standard
 \begin_inset Note Greyedout
-status collapsed
+status open
 
 \begin_layout Plain Layout
 The colors are not shown within LyX, only in the output.
@@ -40706,31 +40754,23 @@ out note appears blue in the output.)
 \end_layout
 
 \begin_layout Standard
-Note, if you change the main text font color and use the option 
+Note, if you change the 
 \family sans
-Color
-\begin_inset space ~
-\end_inset
-
-links
-\family default
- in the document settings under 
-\family sans
-PDF
+Main
 \begin_inset space ~
 \end_inset
 
-properties
+text
 \family default
-, you probably also need to change the link font color by using 
+ font color and use the option 
 \family sans
-Additional
+Color
 \begin_inset space ~
 \end_inset
 
-options
+links
 \family default
- in the 
+ in the document settings under 
 \family sans
 PDF
 \begin_inset space ~
@@ -40738,36 +40778,14 @@ PDF
 
 properties
 \family default
-.
- For example the option
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-linkcolor=black
-\end_layout
-
-\begin_layout Standard
-sets the link text color to black.
- For more information, see the manual of the LaTeX-package 
-\series bold
-hyperref
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-LaTeX-packages ! hyperref
-\end_layout
-
+, you probably also need to change the link font color as described in section
+\begin_inset space ~
 \end_inset
 
-, 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "hyperref"
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:PDF-Properties"
 
 \end_inset
 
@@ -40782,12 +40800,24 @@ key "hyperref"
 \end_layout
 
 \begin_layout Standard
-You can adapt the main text font color and the page background for every
- page in your document if you use these commands as TeX
+You can adapt the 
+\family sans
+Main
+\begin_inset space ~
+\end_inset
+
+text
+\family default
+ font color and the 
+\family sans
+Page
+\family default
+ background for every page in your document if you use these commands as
+ TeX
 \begin_inset space ~
 \end_inset
 
-Code behind a forced page break:
+Code after a forced page break:
 \end_layout
 
 \begin_layout Itemize
@@ -40815,7 +40845,7 @@ color{color name}
 \end_layout
 
 \begin_layout Standard
-The color name can hereby be one of these: 
+You are restricted to one of 
 \series bold
 black
 \series default
@@ -40843,20 +40873,40 @@ red
 \series bold
 white
 \series default
-, 
+ or 
 \series bold
 yellow
 \series default
+ for the 
+\series bold
+color name
+\series default
+ unless you have defined your own color (see the 
+\emph on
+Colored Tables
+\emph default
+ section of the 
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
 
+Objects
+\emph default
+ Manual).
 \begin_inset Newline newline
 \end_inset
 
-If you have changed a text or background color, you can use them under the
- following names:
+If you have changed a text or background color, you can use the following
+ names to refer to them:
 \end_layout
 
 \begin_layout Itemize
-For the page background color:
+For the 
+\family sans
+Page
+\family default
+ background color:
 \begin_inset Newline newline
 \end_inset
 
@@ -40866,7 +40916,15 @@ page_backgroundcolor
 \end_layout
 
 \begin_layout Itemize
-For the main text color:
+For the 
+\family sans
+Main
+\begin_inset space ~
+\end_inset
+
+text
+\family default
+ color:
 \begin_inset Newline newline
 \end_inset
 
@@ -40876,11 +40934,15 @@ document_fontcolor
 \end_layout
 
 \begin_layout Itemize
-For the Shaded
+For the 
+\family sans
+Shaded
 \begin_inset space ~
 \end_inset
 
-box background color:
+boxes
+\family default
+ background color:
 \begin_inset Newline newline
 \end_inset
 
@@ -40890,11 +40952,15 @@ shadecolor
 \end_layout
 
 \begin_layout Itemize
-For the Greyed
+For the 
+\family sans
+Greyed
 \begin_inset space ~
 \end_inset
 
-out note text color:
+out notes
+\family default
+ text color:
 \begin_inset Newline newline
 \end_inset
 
@@ -40904,23 +40970,15 @@ note_fontcolor
 \end_layout
 
 \begin_layout Standard
-To see how to define and use custom colors, see section 
-\emph on
-Colored
+To see how to define and use custom colors, see section Colored
 \begin_inset space ~
 \end_inset
 
-Cells
-\emph default
- of the 
-\emph on
-Embedded
+Cells of the Embedded
 \begin_inset space ~
 \end_inset
 
-Objects
-\emph default
- manual.
+Objects manual.
 \end_layout
 
 \begin_layout Section
@@ -40928,8 +40986,15 @@ Numbering & TOC
 \end_layout
 
 \begin_layout Standard
-Here you can adjust the numbering depth of section headings and the section
- depth in the table of contents as described in section
+Here you can adjust the 
+\family sans
+Numbering
+\family default
+ depth of section headings and the section depth in the 
+\family sans
+Table of Contents
+\family default
+ as described in section
 \begin_inset space ~
 \end_inset
 
@@ -41169,7 +41234,7 @@ Float Placement
 \end_layout
 
 \begin_layout Standard
-The float placement options are described in section 
+The float placement options are described in the section 
 \emph on
 Float
 \begin_inset space ~
@@ -41193,7 +41258,7 @@ Listings
 \end_layout
 
 \begin_layout Standard
-The listings settings are explained in chapter 
+The listings settings are explained in the chapter 
 \emph on
 Program Code Listings
 \emph default
@@ -41271,7 +41336,7 @@ Output
 \begin_inset space ~
 \end_inset
 
-Format: The format that is used when you hit 
+Format: The format that is used when you enter 
 \begin_inset Quotes eld
 \end_inset
 
@@ -41312,6 +41377,11 @@ View
 \family sans
 Tools\SpecialChar \menuseparator
 Preferences\SpecialChar \menuseparator
+File
+\begin_inset space ~
+\end_inset
+
+Handling\SpecialChar \menuseparator
 File Formats
 \family default
 , see section
@@ -41371,9 +41441,20 @@ Output
 \begin_inset space ~
 \end_inset
 
-Options settings for the export format 
+Options offers settings for the export format 
 \family sans
-LyXHTML
+Ly
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{}
+\end_layout
+
+\end_inset
+
+XHTML
 \family default
 .
  
@@ -41410,7 +41491,19 @@ Additional
 Features
 \emph default
  manual.
- The scaling is used for the size of equations in the output.
+ 
+\family sans
+Math
+\begin_inset space ~
+\end_inset
+
+image
+\begin_inset space ~
+\end_inset
+
+scaling
+\family default
+ is used for the size of equations in the output.
 \end_layout
 
 \begin_layout Section
@@ -41432,7 +41525,7 @@ eX Preamble
 In this text field you can enter commands to load special LaTeX-packages
  or to define LaTeX-commands.
  The preamble is a thing for LaTeX-experts.
- You should not enter commands here until you exactly know what you are
+ You should not enter commands here until you know exactly what you are
  doing.
 \end_layout
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 10bde090c8..7892b428c4 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -4355,7 +4355,7 @@ Zitat (kurz)
 status collapsed
 
 \begin_layout Plain Layout
-Zitat!(kurz)
+Zitat ! (kurz)
 \end_layout
 
 \end_inset
@@ -4373,7 +4373,7 @@ Zitat (lang)
 status collapsed
 
 \begin_layout Plain Layout
-Zitat!(lang)
+Zitat ! (lang)
 \end_layout
 
 \end_inset
@@ -4406,11 +4406,7 @@ listung
 status collapsed
 
 \begin_layout Plain Layout
-Auf
-\family sans
-\SpecialChar \textcompwordmark{}
-
-\family default
+Auf\SpecialChar \textcompwordmark{}
 listung
 \end_layout
 
@@ -7303,9 +7299,7 @@ Ionizing
 \begin_inset space ~
 \end_inset
 
-radiation:
-\lang ngerman
- 
+radiation: 
 \begin_inset Argument
 status open
 
@@ -7327,8 +7321,6 @@ itshape, style=nextline
 
 \end_inset
 
-
-\lang english
 Ionizing radiation consists of particles or electromagnetic waves that are
  energetic enough to detach electrons from atoms or molecules, therefore
  ionizing them.
@@ -24252,42 +24244,35 @@ Die Klammern mit dem Werkzeugleistenknopf werden automatisch an die Größe
 \end_layout
 
 \begin_layout Standard
-Um die gewünschten Klammern zu bekommen, klicken Sie auf die gewünschte
- Klammer in der linken und rechten Seite.
-
-\lang english
- If you use the option 
+Um die gewünschten Klammern zu bekommen, klicken Sie auf die Klammer in
+ der linken und rechten Seite.
+ Wenn Sie die Option 
 \family sans
-Keep
-\begin_inset space ~
-\end_inset
-
-matched
+Zusammenpassend
 \family default
-, the selected bracket type will be used for the left and the right side.
- The selection will be shown below the button field.
- If you want one side not to have a bracket, use the blank button.
- It will appear in LyX with a dotted line, but nothing will be printed.
+ verwenden, wird die ausgewählte Klammer für die linke und rechte Seite
+ verwendet.
+ Die Auswahl wird als TeX-Code angezeigt.
+ Wenn Sie auf einer Seite keine Klammer haben wollen, verwenden Sie 
+\family sans
+(kein)
+\family default
+.
+ Dies erscheint in LyX als gestrichelte Linie, es wird aber nichts ausgegeben.
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-If you want to place brackets around math structures, like a square root,
- you can do so by first highlighting (selecting) the structure that is to
- go inside the brackets.
- Then choose the appropriate brackets for left and right and click on 
+Um Klammern um bestehende mathematische Strukturen, wie Wurzeln, zu setzen,
+ markiert man zuerst die Struktur, dann wählt man die entsprechenden Klammern
+ aus und drückt auf 
 \family sans
-Insert
+Einfügen
 \family default
 .
- The parentheses will be drawn around the selected structure.
- The most common bracket combinations (parentheses, square brackets, and
- braces, on both sides) can be entered more quickly using keyboard shortcuts.
- For example, to insert a pair of flexible parentheses on both sides, select
- the structure and enter
-\lang ngerman
- 
+ Die häufigsten Klammern (beidseitig runde, eckige und geschweifte) können
+ schneller mit Tastenkürzeln eingefügt werden.
+ Um zum Beispiel ein Paar runde Klammern einzufügen, markiert man die Struktur
+ und verwendet das Kürzel 
 \begin_inset Info
 type  "shortcut"
 arg   "math-delim ( )"
@@ -41032,7 +41017,31 @@ Farbe ! Hintergrund
 status collapsed
 
 \begin_layout Plain Layout
-Farbe ! Haupttext-
+Farbe ! Haupttext
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Farbe ! Schattierte
+\begin_inset space ~
+\end_inset
+
+Boxen
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Farbe ! Grauschrift-Notizen
 \end_layout
 
 \end_inset
@@ -41041,8 +41050,13 @@ Farbe ! Haupttext-
 \end_layout
 
 \begin_layout Standard
-Hier können Sie die Schriftfarbe für den Haupttext (Voreinstellung: schwarz)
- und für Grauschrift-Notizen (Voreinstellung: hellgrau) ändern.
+Hier können Sie die Schriftfarbe für den Haupttext (Voreinstellung: schwarz),
+ für Grauschrift-Notizen (Voreinstellung: hellgrau), die Hintergrundfarbe
+ für die Seiten (Voreinstellung: weiß) und für Schattierte
+\begin_inset space ~
+\end_inset
+
+Boxen (Voreinstellung: rot) ändern.
  Der Kopf 
 \family sans
 Zurücksetzen
@@ -41051,12 +41065,18 @@ Zurücksetzen
 \end_layout
 
 \begin_layout Standard
-Sie können außerdem die Hintergrundfarbe für die Seiten (Voreinstellung:
- weiß) und für Schattierte
-\begin_inset space ~
-\end_inset
-
-Boxen (Voreinstellung: rot) ändern.
+Durch Klicken auf entweder 
+\family sans
+Standard
+\family default
+ oder 
+\family sans
+Änderung
+\family default
+ wird ein Dialog geöffnet, in dem man eine Farbe per Klick oder per Angabe
+ von HSL oder RGB Werten auswählen kann.
+ Im Dialog kann man jede Farbe zu den benutzerdefinierten Farben hinzufügen
+ um sie später schneller auswählen zu können.
 \end_layout
 
 \begin_layout Standard
@@ -41087,52 +41107,18 @@ einfärben
 PDF-Eigenschaften
 \family default
  verwenden, müssen Sie wahrscheinlich auch die Schriftfarbe der Links ändern,
- indem sie 
-\family sans
-Zusätzliche
+ wie in Abschnitt
 \begin_inset space ~
 \end_inset
 
-Optionen
-\family default
- in den 
-\family sans
-PDF-Eigenschaften
-\family default
- verwenden.
- Zum Beispiel färbt die Option
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-linkcolor=black
-\end_layout
 
-\begin_layout Standard
-den Linktext schwarz.
- Für weitere Informationen, siehe das Handbuch des LaTeX-Pakets 
-\series bold
-hyperref
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-LaTeX-Paket ! hyperref
-\end_layout
-
-\end_inset
-
-, 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "hyperref"
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:PDF-Eigenschaften"
 
 \end_inset
 
-.
+ beschrieben ist.
 \end_layout
 
 \begin_layout Standard
@@ -41173,7 +41159,7 @@ color{Farbname}
 \end_layout
 
 \begin_layout Standard
-Der Farbname kann einer dieser Namen sein: 
+Der Farbname kann nur einer dieser Namen sein: 
 \series bold
 black
 \series default
@@ -41204,6 +41190,20 @@ white
 , 
 \series bold
 yellow
+\series default
+ solange man keine eigene Farbe definiert hat (siehe Abschnitt 
+\emph on
+Farbige Tabellen
+\emph default
+ des 
+\emph on
+Eingebettete
+\begin_inset space ~
+\end_inset
+
+Objekte
+\emph default
+ Handbuchs).
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 19f935221f..9215ccdbf0 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -24540,18 +24540,26 @@ iguales
 \family default
 , el tipo de delimitador seleccionado se pondrá en ambos lados.
  El comando TeX de la selección se mostrará bajo el panel de botones.
- Si quieres que un lado no tenga delimitador, usa el botón 
+ Si quieres que un lado no tenga delimitador, usa 
 \family sans
-Ninguno
+(
+\lang english
+none
+\lang spanish
+)
 \family default
 .
  En LyX se mostrará una línea punteada pero no se imprime en la salida.
 \end_layout
 
 \begin_layout Standard
-Si quieres poner delimitadores alrededor de estructuras matemáticas, como
- una raíz cuadrada, puedes seleccionar la estructura que debe incluirse,
- escoger los delimitadores deseados y pulsar 
+Si quieres poner delimitadores alrededor de 
+\lang english
+existing
+\lang spanish
+ estructuras matemáticas, como una raíz cuadrada, puedes seleccionar la
+ estructura que debe incluirse, escoger los delimitadores deseados y pulsar
+ 
 \family sans
 Insert
 \family default
@@ -41345,11 +41353,37 @@ Color ! Fondo
 \end_inset
 
 
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Color ! 
+\lang english
+Shaded boxes
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Color ! 
+\lang english
+Greyed-out notes
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
-Aquí puede cambiar el color para el texto principal (por omisión: negro)
- y para las notas resaltadas en gris (por omisión: gris claro).
+Aquí puede cambiar el color para el texto principal (por omisión: negro),
+ para las notas resaltadas en gris (por omisión: gris claro), para del fondo
+ de las páginas (por omisión: blanco) y pare de los marcos (por omisión:
+ rojo).
  El botón 
 \family sans
 Reiniciar
@@ -41358,8 +41392,20 @@ Reiniciar
 \end_layout
 
 \begin_layout Standard
-También puedes cambiar el color de fondo de las páginas (por omisión: blanco)
- y de los marcos (por omisión: rojo).
+
+\lang english
+Clicking any button showing 
+\family sans
+Default
+\family default
+ or 
+\family sans
+Change
+\family default
+ opens a dialog enabling you to choose from a selection of  colors or from
+ a color-picker or to specify a color using HSL or RGB values.
+ In the dialog you can add any color to the custom colors to select them
+ later more quickly.
 \end_layout
 
 \begin_layout Standard
@@ -41398,52 +41444,18 @@ Propiedades
 PDF
 \family default
  de la configuración del documento, probablemente debas cambiar el color
- de los enlaces en 
-\family sans
-Opciones
-\begin_inset space ~
-\end_inset
+ 
+\lang english
+as described in section
+\lang spanish
 
-adicionales d
-\family default
-e 
-\family sans
-Propiedades
 \begin_inset space ~
 \end_inset
 
-PDF
-\family default
-.
- Por ejemplo, la opción
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-linkcolor=black
-\end_layout
-
-\begin_layout Standard
-establece negro para el color de los enlaces.
- Para más información, véase el manual del paquete LaTeX 
-\series bold
-hyperref
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-LaTeX, paquetes ! hyperref
-\end_layout
 
-\end_inset
-
-, 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "hyperref"
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Propiedades-PDF"
 
 \end_inset
 
@@ -41488,7 +41500,11 @@ color{nombre de color}
 \end_layout
 
 \begin_layout Standard
-El nombre del color puede ser aquí uno de estos: 
+
+\lang english
+You are restricted to one of
+\lang spanish
+ 
 \series bold
 black
 \series default
@@ -41516,10 +41532,30 @@ red
 \series bold
 white
 \series default
-, 
+ o 
 \series bold
 yellow
 \series default
+ 
+\lang english
+for the 
+\series bold
+color name
+\series default
+ unless you have defined your own color (see the 
+\emph on
+Colored Tables
+\emph default
+ section of the 
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ Manual).
+\lang spanish
 
 \begin_inset Newline newline
 \end_inset
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index af7a18a59f..98243f03b4 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -7232,11 +7232,13 @@ est utilisée:
 \end_layout
 
 \begin_layout Description
+
+\lang english
 Ionizing
 \begin_inset space ~
 \end_inset
 
-radiation:
+radiation: 
 \begin_inset Argument
 status open
 
@@ -7258,12 +7260,14 @@ itshape, style=nextline
 
 \end_inset
 
- Ionizing radiation consists of particles or electromagnetic waves that
- are energetic enough to detach electrons from atoms or molecules, therefore
+Ionizing radiation consists of particles or electromagnetic waves that are
+ energetic enough to detach electrons from atoms or molecules, therefore
  ionizing them.
 \end_layout
 
 \begin_layout Description
+
+\lang english
 Reference
 \begin_inset space ~
 \end_inset
@@ -24940,27 +24944,35 @@ Si vous utilisez l'icône de délimitation, les parenthèses et autres délimite
 \end_layout
 
 \begin_layout Standard
-Il est très facile de construire les crochets que vous souhaitez.
- Cliquez sur le crochet que vous voulez avoir à gauche dans la fenêtre de
- gauche et sur celui que vous voulez à droite dans la fenêtre de droite,
- et placez-les dans le document en appuyant sur le bouton 
+
+\lang english
+To construct brackets click on the button for the bracket you want on the
+ left side and right side.
+ If you use the option 
 \family sans
-Insertion
+Keep
+\begin_inset space ~
+\end_inset
+
+matched
 \family default
-.
- Si vous voulez un côté sans délimiteur, utilisez le bouton vide.
- LyX affichera une ligne pointillée, mais n'imprimera rien.
- Si vous cochez l'option 
+, the selected bracket type will be used for the left and the right side.
+ The selection will be shown as TeX code.
+ If you want one side not to have a bracket, use 
 \family sans
-Apparier
+(none)
 \family default
-, vous ne choisissez qu'un seul délimiteur, LyX choisit pour vous le délimiteur
- de même type pour l'autre côté.
+.
+ It will appear in LyX with a dotted line, but nothing will be printed.
 \end_layout
 
 \begin_layout Standard
 Si vous décidez après coup de placer des parenthèses (ou une autre structure
  mathématique, comme une racine carrée, ou un autre ornement) autour d'une
+ 
+\lang english
+existing
+\lang french
  structure mathématique déjà existante, c'est faisable.
  Sélectionnez la structure en question (en maintenant la touche 
 \family sans
@@ -24974,7 +24986,6 @@ Shift
 Insertion
 \family default
 .
- Les parenthèses seront placées autour de la structure sélectionnée.
  Les combinaisons les plus courantes (parenthèses, crochets et accolades
  associées) peuvent être saisies via les raccourcis clavier.
  Par exemple, pour insérer une paire de parenthèses flexibles, sélectionner
@@ -42720,12 +42731,37 @@ Couleurs ! fond
 \end_inset
 
 
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Couleurs ! 
+\lang english
+Shaded boxes
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Couleurs ! 
+\lang english
+Greyed-out notes
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
 Vous pouvez via cette rubrique modifier la couleur de la police du texte
- principal (implicitement noire) et du texte des notes grisées (implicitement
- gris léger).
+ principal (implicitement noire), du texte des notes grisées (implicitement
+ gris léger), du fond pour les pages (implicitement blanche) et pour le
+ boîtes ombrées (implicitement rouge).
  Le bouton 
 \family sans
 RàZ 
@@ -42734,8 +42770,20 @@ repositionne les couleurs sur les valeurs implicites.
 \end_layout
 
 \begin_layout Standard
-Vous pouvez également modifier les couleur du fond pour les pages (implicitement
- blanche) et pour le boîtes ombrées (implicitement rouge).
+
+\lang english
+Clicking any button showing 
+\family sans
+Default
+\family default
+ or 
+\family sans
+Change
+\family default
+ opens a dialog enabling you to choose from a selection of  colors or from
+ a color-picker or to specify a color using HSL or RGB values.
+ In the dialog you can add any color to the custom colors to select them
+ later more quickly.
 \end_layout
 
 \begin_layout Standard
@@ -42782,57 +42830,18 @@ PDF
 \family sans
 Hyperlien
 \family default
-, vous devez probablement modifier la couleur des liens symboliques en utilisant
- 
-\family sans
-Autres
-\begin_inset space ~
-\end_inset
-
-options 
-\family default
-dans ces 
-\family sans
-Propriétés
-\begin_inset space ~
-\end_inset
+, vous devez probablement modifier la couleur des liens symboliques 
+\lang english
+as described in section
+\lang french
 
-du
 \begin_inset space ~
 \end_inset
 
-PDF
-\family default
-.
- Par exemple l'option
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-linkcolor=black
-\end_layout
 
-\begin_layout Standard
-met les liens en noir.
- Pour plus d'informations, voyez le manuel du paquetage LaTeX 
-\series bold
-hyperref
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Paquetages LaTeX ! hyperref
-\end_layout
-
-\end_inset
-
-, 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "hyperref"
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:propriétés-du-PDF"
 
 \end_inset
 
@@ -42881,7 +42890,11 @@ color{color name}
 \end_layout
 
 \begin_layout Standard
-Les noms de couleur doivent être choisis parmi: 
+
+\lang english
+You are restricted to one of
+\lang french
+ 
 \series bold
 black
 \series default
@@ -42909,11 +42922,31 @@ red
 \series bold
 white
 \series default
-, 
+ ou 
 \series bold
 yellow
 \series default
-.
+ 
+\lang english
+for the 
+\series bold
+color name
+\series default
+ unless you have defined your own color (see the 
+\emph on
+Colored Tables
+\emph default
+ section of the 
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ Manual).
+\lang french
+
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index b99b049e70..f457c2008d 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -19499,9 +19499,18 @@ arg   "dialog-show mathdelimiter"
 \end_layout
 
 \begin_layout Standard
-括弧を作成するには、左側と右側に使う括弧のボタンをクリックしてください。左右対称オプションを使用すると、選択した括弧型が左右両方に使用されます。選択した括弧は、
-ボタンフィールドの下に表示されます。片側に括弧をつけたくない場合は、空白ボタンを使用してください。LyX上では破線が表示されますが、印刷時には何も印字されなくな
-ります。
+括弧を作成するには、左側と右側に使う括弧のボタンをクリックしてください。左右対称オプションを使用すると、選択した括弧型が左右両方に使用されます。
+\lang english
+The selection will be shown as TeX code
+\lang japanese
+。
+\lang english
+If you want one side not to have a bracket, use 
+\family sans
+(none)
+\family default
+\lang japanese
+。LyX上では破線が表示されますが、印刷時には何も印字されなくなります。
 \end_layout
 
 \begin_layout Standard
@@ -33542,26 +33551,25 @@ status collapsed
 \end_inset
 
 
-\end_layout
+\begin_inset Index idx
+status open
 
-\begin_layout Standard
-ここでは、本文のフォント色(既定値:黒)と、淡色表示注釈のフォント色(既定値:淡灰色)を変更することができます。
-\family sans
-リセット
-\family default
-ボタンを押すと、色は既定値に戻ります。
+\begin_layout Plain Layout
+いろ@色 ! 
+\lang english
+Shaded boxes
 \end_layout
 
-\begin_layout Standard
-また、頁の背景色(既定値:白)と影付きボックスの背景色(既定値:赤)を変更することもできます。
-\end_layout
+\end_inset
 
-\begin_layout Standard
-\begin_inset Note Greyedout
+
+\begin_inset Index idx
 status open
 
 \begin_layout Plain Layout
-色はLyX中の表示には反映されず、出力中にのみ表れます(この淡色表示注釈は出力中では青で表示されます)。
+いろ@色 ! 
+\lang english
+Greyed-out notes
 \end_layout
 
 \end_inset
@@ -33570,54 +33578,107 @@ status open
 \end_layout
 
 \begin_layout Standard
-本文フォント色を変更した上、さらに文書設定の
+
+\lang english
+Here you can alter the font color for the 
 \family sans
-PDF特性
+Main text
 \family default
-で
+ (default: black), for 
 \family sans
-色付きリンク
+Greyed
+\begin_inset space ~
+\end_inset
+
+out notes
 \family default
-オプションを有効にした場合、おそらく
+ (default: light grey)for the background color for the 
 \family sans
-PDF特性
+Page
 \family default
-の
+ (default: white) and for 
 \family sans
-追加オプション
+Shaded
+\begin_inset space ~
+\end_inset
+
+boxes
+\family default
+ (default: red).
+ The button 
+\family sans
+Reset
 \family default
-でリンクフォント色も変更する必要があります。例えば、オプションに
+ sets the color back to the default.
 \end_layout
 
 \begin_layout Standard
 
-\series bold
-linkcolor=black
+\lang english
+Clicking any button showing 
+\family sans
+Default
+\family default
+ or 
+\family sans
+Change
+\family default
+ opens a dialog enabling you to choose from a selection of  colors or from
+ a color-picker or to specify a color using HSL or RGB values.
+ In the dialog you can add any color to the custom colors to select them
+ later more quickly.
 \end_layout
 
 \begin_layout Standard
-と指定すれば、リンクフォント色が黒に設定されます。詳しくは、LaTeXパッケージ
-\series bold
-hyperref
-\series default
-
-\begin_inset Index idx
-status collapsed
+\begin_inset Note Greyedout
+status open
 
 \begin_layout Plain Layout
-Latexぱっけーじ@LaTeXパッケージ ! hyperref
+色はLyX中の表示には反映されず、出力中にのみ表れます(この淡色表示注釈は出力中では青で表示されます)。
 \end_layout
 
 \end_inset
 
- 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "hyperref"
 
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Note, if you change the 
+\family sans
+Main
+\begin_inset space ~
+\end_inset
+
+text
+\family default
+ font color and use the option 
+\family sans
+Color
+\begin_inset space ~
+\end_inset
+
+links
+\family default
+ in the document settings under 
+\family sans
+PDF
+\begin_inset space ~
 \end_inset
 
-の取扱説明書をご覧ください。
+properties
+\family default
+, you probably also need to change the link font color as described in section
+\lang japanese
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:PDF特性"
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
@@ -33656,7 +33717,11 @@ color{色名}
 \end_layout
 
 \begin_layout Standard
-ここで、色名は次のいずれかです: 
+
+\lang english
+You are restricted to one of
+\lang japanese
+ 
 \series bold
 black
 \series default
@@ -33684,10 +33749,34 @@ red
 \series bold
 white
 \series default
-, 
+ 
+\lang english
+or
+\lang japanese
+ 
 \series bold
 yellow
 \series default
+ 
+\lang english
+for the 
+\series bold
+color name
+\series default
+ unless you have defined your own color (see the 
+\emph on
+Colored Tables
+\emph default
+ section of the 
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ Manual).
+\lang japanese
 
 \begin_inset Newline newline
 \end_inset
-- 
2.39.5