From 945a3486843b36761c30685e7e151c22e0e31f97 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Mon, 1 Jun 2015 23:03:55 +0200
Subject: [PATCH] EmbeddedObjects.lyx: more updates for the box description

---
 lib/doc/EmbeddedObjects.lyx                   | 78 ++--------------
 .../Changelog-EmbeddedObjects-LyX_22x.txt     |  1 +
 lib/doc/de/EmbeddedObjects.lyx                | 68 ++------------
 lib/doc/es/EmbeddedObjects.lyx                | 75 ++--------------
 lib/doc/fr/EmbeddedObjects.lyx                | 81 ++---------------
 lib/doc/ja/EmbeddedObjects.lyx                | 89 +++++--------------
 6 files changed, 51 insertions(+), 341 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index efec544c47..94502877ed 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -33651,27 +33651,7 @@ simple rectangular frame
 \family default
  and no inner box, you can allow page breaks within a box.
  Note that then, unlike other framed boxes, the frame always uses the whole
- column width, the box is set as its own paragraph, and 
-\series bold
-
-\backslash
-fboxrule
-\series default
- and 
-\series bold
-
-\backslash
-fboxsep
-\series default
- have no effect on this box type.
- The frame line thickness has the size of 
-\series bold
-
-\backslash
-FrameRule
-\series default
-.
- 
+ column width and the box is set as its own paragraph: 
 \begin_inset Box Framed
 position "t"
 hor_pos "c"
@@ -33854,23 +33834,11 @@ cornersize{0.5}
 \end_layout
 
 \begin_layout Standard
-For 
+The default background color red of 
 \family sans
 shaded background
 \family default
- boxes the default space between the box content and the box border is 3
-\begin_inset space \thinspace{}
-\end_inset
-
-pt and can be changed with the value of 
-\series bold
-
-\backslash
-fboxsep
-\series default
-.
- The default background color red can either be changed locally with the
- command 
+ boxes can either be changed locally with the command 
 \series bold
 
 \backslash
@@ -33939,23 +33907,11 @@ reference "sec:Colored-Boxes"
 
  For example the appearance of the following shaded background box is set
  with the \SpecialChar TeX
--Code commands
+-Code command
 \end_layout
 
 \begin_layout Standard
 
-\series bold
-
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\series default
-
-\begin_inset Newline newline
-\end_inset
-
-
 \series bold
 
 \backslash
@@ -33969,15 +33925,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -34028,15 +33975,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{3pt}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
@@ -34050,8 +33988,8 @@ definecolor{shadecolor}{rgb}{1,0,0}
 \begin_inset VSpace bigskip
 \end_inset
 
-Manually changed lengths, widths and colors are valid for all boxes following
- the commands that change them.
+Manually changed sizes and colors are valid for all boxes following the
+ commands that change them.
 \end_layout
 
 \begin_layout Section
@@ -39180,7 +39118,7 @@ Text
 Here is a child document inserted as Verbatim: 
 \begin_inset CommandInset include
 LatexCommand verbatiminput
-filename "DummyTextDocument.txt"
+filename "DUMMYT~1.TXT"
 
 \end_inset
 
@@ -39195,7 +39133,7 @@ Mark spaces in output
  option: 
 \begin_inset CommandInset include
 LatexCommand verbatiminput*
-filename "DummyTextDocument.txt"
+filename "DUMMYT~1.TXT"
 
 \end_inset
 
diff --git a/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt b/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
index 26d89f42a9..527ae7841a 100644
--- a/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
+++ b/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
@@ -2,6 +2,7 @@ Modified:
 
 - sec. 2.2: (Japanese only) added a sentence
 - sec. 5.2.3: 2 changed sentences
+- sec. 5.3: (Japanese only) changed sentence
 - sec. 5.7: complete revision
 
 
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 4b2aba05fa..359566fa40 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -33780,28 +33780,8 @@ Einfacher rechteckiger Rahmen
 \family default
  und keine innere Box verwenden, können Sie Seitenumbrüche in der Box erlauben.
  Beachten Sie, dass im Gegensatz zu anderen gerahmten Boxen, der Rahmen
- immer über die gesamte Zeilenbreite gezeichnet wird, die Box ein Absatz
- für sich ist und 
-\series bold
-
-\backslash
-fboxrule
-\series default
- und 
-\series bold
-
-\backslash
-fboxsep
-\series default
- keinen Einfluss auf diesen Box Typ haben.
- Die Rahmendicke wird durch 
-\series bold
-
-\backslash
-FrameRule
-\series default
- festgelegt.
- 
+ immer über die gesamte Zeilenbreite geht und dass die Box ein Absatz für
+ sich ist: 
 \begin_inset Box Framed
 position "t"
 hor_pos "c"
@@ -33982,23 +33962,11 @@ cornersize{0.5}
 \begin_inset VSpace bigskip
 \end_inset
 
-Für Boxen mit 
+Die Standard-Hintergrundfarbe rot von Boxen mit 
 \family sans
 schattiertem Hintergrund
 \family default
- beträgt der Abstand zwischen Rand und Text 3
-\begin_inset space \thinspace{}
-\end_inset
-
-pt und kann mit 
-\series bold
-
-\backslash
-fboxsep
-\series default
- geändert werden.
- Die Standard-Hintergrundfarbe ist rot und kann entweder lokal mit dem Befehl
- 
+ kann entweder lokal mit dem Befehl 
 \series bold
 
 \backslash
@@ -34074,14 +34042,6 @@ reference "abs:Farbige-Boxen"
 
 \series bold
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\begin_inset Newline newline
-\end_inset
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -34093,15 +34053,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -34150,15 +34101,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{3pt}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
@@ -34172,7 +34114,7 @@ definecolor{shadecolor}{rgb}{1,0,0}
 \begin_inset VSpace bigskip
 \end_inset
 
-Geänderte Längen und Breiten gelten für alle Boxen, die auf den Befehl folgen,
+Geänderte Größen und Farben gelten für alle Boxen, die auf den Befehl folgen,
  der sie ändert.
 \end_layout
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index b9be4ee4b1..bef7953651 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -33352,27 +33352,8 @@ borde rectangular sencillo
 \family default
  sin marco interior, puedes permitir saltos de página dentro del marco.
  Ten en cuenta que en ese caso, al contrario que otros marcos con bordes,
- el borde usa siempre todo el ancho de columna, el marco se establece como
- su párrafo propio y 
-\series bold
-
-\backslash
-fboxrule
-\series default
- y 
-\series bold
-
-\backslash
-fboxsep
-\series default
- no funcionan.
- El grosor del borde tiene el tamaño de 
-\series bold
-
-\backslash
-FrameRule
-\series default
-.
+ el borde usa siempre todo el ancho de columna y el marco se establece como
+ su párrafo propio: 
 \begin_inset Box Framed
 position "t"
 hor_pos "c"
@@ -33559,7 +33540,7 @@ cornersize{0.5}
 \end_layout
 
 \begin_layout Standard
-Para los marcos con 
+El color rojo predeterminado de los marcos con 
 \family sans
 fondo
 \begin_inset space ~
@@ -33567,19 +33548,7 @@ fondo
 
 coloreado
 \family default
- el espacio por omisión entre el contenido y el borde es 3
-\begin_inset space \thinspace{}
-\end_inset
-
-pt; se puede cambiar con el valor de 
-\series bold
-
-\backslash
-fboxsep
-\series default
-.
- El color rojo predeterminado se puede cambiar en el sitio con el comando
- 
+ se puede cambiar en el sitio con el comando 
 \series bold
 
 \backslash
@@ -33658,24 +33627,12 @@ reference "sec:Marcos-Coloreados"
 
 \end_inset
 
- Por ejemplo, la nota siguiente se define con los comandos en código \SpecialChar TeX
+ Por ejemplo, la nota siguiente se define con el comando en código \SpecialChar TeX
 
 \end_layout
 
 \begin_layout Standard
 
-\series bold
-
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\series default
-
-\begin_inset Newline newline
-\end_inset
-
-
 \series bold
 
 \backslash
@@ -33689,15 +33646,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -33738,15 +33686,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{3pt}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
@@ -33760,8 +33699,8 @@ definecolor{shadecolor}{rgb}{1,0,0}
 \begin_inset VSpace bigskip
 \end_inset
 
-Los cambios en las dimensiones son válidos para todos los marcos que siguen
- a los comandos.
+Los cambios en las dimensiones y de los colores son válidos para todos los
+ marcos que siguen a los comandos.
 \end_layout
 
 \begin_layout Section
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index a78ad3a0f7..3f52f94a8a 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -34271,28 +34271,8 @@ cadre rectangulaire simple
  sans boîte intérieure, vous pouvez autoriser les sauts de page à l'intérieur
  de la boîte.
  Notez que dans ce cas, contrairement aux autres boîtes avec cadre, le cadre
- prendra toute la largeur de la colonne, la boîte sera considérée comme
- son propre paragraphe et 
-\series bold
-
-\backslash
-fboxrule
-\series default
- et 
-\series bold
-
-\backslash
-fboxsep
-\series default
- n'ont aucun effet sur ce type de boîte.
- L'épaisseur de la ligne du cadre a la valeur de 
-\series bold
-
-\backslash
-FrameRule
-\series default
-.
- 
+ prendra toute la largeur de la colonne et la boîte sera considérée comme
+ son propre paragraphe: 
 \begin_inset Box Framed
 position "t"
 hor_pos "c"
@@ -34475,7 +34455,7 @@ cornersize{0.5}
 \end_layout
 
 \begin_layout Standard
-Pour les boîtes à 
+La couleur rouge utilisée implicitement pour les boîtes à 
 \family sans
 Fond
 \begin_inset space ~
@@ -34483,20 +34463,7 @@ Fond
 
 ombré
 \family default
-, l'espacement implicite entre le contenu de la boîte et son cadre est de
- 3
-\begin_inset space \thinspace{}
-\end_inset
-
-pt et il peut être modifié avec la valeur de 
-\series bold
-
-\backslash
-fboxsep
-\series default
-.
- La couleur rouge utilisée implicitement pour le fond peut soit être modifiée
- localement avec la commande 
+ peut soit être modifiée localement avec la commande 
 \series bold
 
 \backslash
@@ -34535,7 +34502,7 @@ reference "sec:Tableaux-Colorés"
 
 \end_inset
 
-
+.
 \begin_inset Foot
 status collapsed
 
@@ -34568,29 +34535,17 @@ reference "sec:Boîtes-colorées"
 
 \end_inset
 
-.
+
 \end_layout
 
 \begin_layout Standard
 Par exemple l'apparence de la note à fond ombré suivante a été modifié avec
- les commandes en code \SpecialChar TeX
+ le commande en code \SpecialChar TeX
  suivantes
 \end_layout
 
 \begin_layout Standard
 
-\series bold
-
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\series default
-
-\begin_inset Newline newline
-\end_inset
-
-
 \series bold
 
 \backslash
@@ -34604,15 +34559,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -34664,15 +34610,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{3pt}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
@@ -34690,8 +34627,8 @@ definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
 
 \begin_layout Standard
-Les longueurs et les largeurs ainsi modifiées restent valables pour toutes
- les boîtes qui suivent la commandes qui les a changées.
+Les largeurs et culeurs ainsi modifiées restent valables pour toutes les
+ boîtes qui suivent la commandes qui les a changées.
 \end_layout
 
 \begin_layout Section
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 4ce3f1914d..efa01e67ce 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -31619,30 +31619,17 @@ status collapsed
 \begin_inset VSpace bigskip
 \end_inset
 
-装飾として
+
+\lang english
+When you use the decoration 
 \family sans
-簡素な長方形の箱型
+simple rectangular frame
 \family default
-を使用し、内部ボックスをなしにした場合には、ボックス内で改行をすることができます。その際、他の枠付きボックスと異なり、枠は列幅全体に広げられて独立した段落に置か
-れ、このボックス型では
-\series bold
-
-\backslash
-fboxrule
-\series default
-と
-\series bold
-
-\backslash
-fboxsep
-\series default
-は無効となります。枠線の太さは
-\series bold
-
-\backslash
-FrameRule
-\series default
-の値になります。 
+ and no inner box, you can allow page breaks within a box.
+ Note that then, unlike other framed boxes, the frame always uses the whole
+ column width and the box is set as its own paragraph:
+\lang japanese
+ 
 \begin_inset Box Framed
 position "t"
 hor_pos "c"
@@ -31830,21 +31817,14 @@ cornersize{0.5}
 
 \begin_layout Standard
 
+\lang english
+The default background color red of 
 \family sans
-影付き背景
+shaded background
 \family default
-ボックスでは、ボックスの内容と枠の余白の既定値は3
-\begin_inset space \thinspace{}
-\end_inset
-
-ptになっていますが、
-\series bold
-
-\backslash
-fboxsep
-\series default
-の値を変更することで変えられます。既定の背景色である赤色は、
+ boxes can either be changed locally with the command
 \series bold
+\lang japanese
 
 \backslash
 definecolor{shadebox}
@@ -31871,7 +31851,7 @@ reference "sec:色付きの表"
 
 節
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 N
@@ -31906,18 +31886,6 @@ reference "sec:色付きボックス"
 
 \begin_layout Standard
 
-\series bold
-
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\series default
-
-\begin_inset Newline newline
-\end_inset
-
-
 \series bold
 
 \backslash
@@ -31936,15 +31904,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{0.5cm}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{cmyk}{0.5,0,1,0.5}
 \end_layout
@@ -31989,15 +31948,6 @@ status collapsed
 \begin_layout Plain Layout
 
 
-\backslash
-setlength{
-\backslash
-fboxsep}{3pt}
-\end_layout
-
-\begin_layout Plain Layout
-
-
 \backslash
 definecolor{shadecolor}{rgb}{1,0,0}
 \end_layout
@@ -32011,7 +31961,10 @@ definecolor{shadecolor}{rgb}{1,0,0}
 \begin_inset VSpace bigskip
 \end_inset
 
-変更した長さや幅は、変更を設定したコマンド以後のすべてのボックスに有効となります。
+
+\lang english
+Manually changed sizes and colors are valid for all boxes following the
+ commands that change them.
 \end_layout
 
 \begin_layout Section
@@ -36763,7 +36716,7 @@ textvisiblespace
 以下は、verbatimとして挿入された子文書です。 
 \begin_inset CommandInset include
 LatexCommand verbatiminput
-filename "../DummyTextDocument.txt"
+filename "../DUMMYT~1.TXT"
 
 \end_inset
 
@@ -36778,7 +36731,7 @@ filename "../DummyTextDocument.txt"
 オプションを指定して、verbatimとして挿入された子文書です。 
 \begin_inset CommandInset include
 LatexCommand verbatiminput*
-filename "../DummyTextDocument.txt"
+filename "../DUMMYT~1.TXT"
 
 \end_inset
 
-- 
2.39.2