commit 3e93c4f79b5349d79662c03f2326c4f55607f6b9
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Jan 16 14:49:24 2018 +0100

    example files: distribute some changes
    
    - French:
     - fix compilation of beamer.lyx
     - update a screenshot
---
 lib/examples/beamer.lyx      |   65 ++++---------------------
 lib/examples/de/beamer.lyx   |    3 +-
 lib/examples/fr/beamer.lyx   |  111 +++++++++++++++++++-----------------------
 lib/examples/fr/xyfigure.png |  Bin 93178 -> 57200 bytes
 lib/examples/ja/beamer.lyx   |    3 +-
 5 files changed, 62 insertions(+), 120 deletions(-)

diff --git a/lib/examples/beamer.lyx b/lib/examples/beamer.lyx
index 85ea150..dd8cbda 100644
--- a/lib/examples/beamer.lyx
+++ b/lib/examples/beamer.lyx
@@ -72,12 +72,11 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -896,12 +895,8 @@ type  "shortcut"
 arg   "depth-increment"
 \end_inset
 
-)
-\change_inserted -712698321 1514652486
-.
+).
  This is done automatically if you insert new frame paragraphs.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
@@ -982,20 +977,8 @@ There is a simple and much more convenient way to start a 
new frame: Issue
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_deleted -712698321 1514652514
-Edit
-\change_inserted -712698321 1514652516
-Insert
-\change_unchanged
-\SpecialChar menuseparator
-
-\change_deleted -712698321 1514652520
-Start New Environment
-\change_inserted -712698321 1514652821
+Insert\SpecialChar menuseparator
 Separated Frame Below
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -1006,10 +989,6 @@ type  "shortcut"
 arg   "environment-split"
 \end_inset
 
-
-\change_deleted -712698321 1514652564
-)
-\change_unchanged
  if you are in a non-nested 
 \begin_inset Flex Structure
 status collapsed
@@ -1021,51 +1000,24 @@ Frame
 \end_inset
 
  paragraph, or 
-\change_deleted -712698321 1514652572
-
-\begin_inset Flex Alert
-status collapsed
-
-\begin_layout Plain Layout
-Edit\SpecialChar menuseparator
-Start New Parent Environment
-\end_layout
-
-\end_inset
-
- (
-\change_unchanged
-
 \begin_inset Info
 type  "shortcut"
 arg   "environment-split outer"
 \end_inset
 
-
-\change_deleted -712698321 1514652575
-)
-\change_unchanged
-, respectively, if you are in a nested paragraph within the frame
-\change_inserted -712698321 1514652721
-).
+, respectively, if you are in a nested paragraph within the frame).
  If you are in the frame heading, 
 \begin_inset Flex Alert
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514652823
 Insert\SpecialChar menuseparator
 Separated Frame Above
-\change_unchanged
-
 \end_layout
 
 \end_inset
 
- inserts a new, properly separated frame above the current one
-\change_unchanged
-!
+ inserts a new, properly separated frame above the current one!
 \end_layout
 
 \end_deeper
@@ -4356,8 +4308,11 @@ status collapsed
 \begin_layout Plain Layout
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
-\SpecialChar LaTeX
- Preamble
+LaTeX
+\begin_inset space ~
+\end_inset
+
+Preamble
 \end_layout
 
 \end_inset
diff --git a/lib/examples/de/beamer.lyx b/lib/examples/de/beamer.lyx
index f430239..d874b70 100644
--- a/lib/examples/de/beamer.lyx
+++ b/lib/examples/de/beamer.lyx
@@ -4808,8 +4808,7 @@ status collapsed
 \begin_layout Plain Layout
 Dokument\SpecialChar menuseparator
 Einstellungen\SpecialChar menuseparator
-\SpecialChar LaTeX
--Vorspann
+LaTeX-Vorspann
 \end_layout
 
 \end_inset
diff --git a/lib/examples/fr/beamer.lyx b/lib/examples/fr/beamer.lyx
index 9b16471..3f60690 100644
--- a/lib/examples/fr/beamer.lyx
+++ b/lib/examples/fr/beamer.lyx
@@ -135,7 +135,7 @@ Version
 
 \begin_layout TitleGraphic
 \begin_inset Graphics
-       filename /ext/lyx/2.3.x/lib/doc/clipart/3D-structure-distort.pdf
+       filename ../../doc/clipart/3D-structure-distort.pdf
        lyxscale 30
        scale 10
 
@@ -179,7 +179,7 @@ Objectifs
 
 \begin_layout Frame
 \begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -783,7 +783,7 @@ Spécifications de recouvrement {implicites}
 
 \begin_layout Frame
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -794,7 +794,7 @@ status collapsed
 
 
 \begin_inset Argument 3
-status collapsed
+status open
 
 \begin_layout Plain Layout
 label=myframe
@@ -885,7 +885,7 @@ recouvrement
 \begin_deeper
 \begin_layout Proof
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -971,7 +971,7 @@ arg   "depth-increment"
 \end_inset
 
 ); ceci est automatique si vous insérez de nouveaux paragraphes dans le
- cadre
+ cadre.
 \end_layout
 
 \begin_layout Itemize
@@ -1095,7 +1095,7 @@ Cadre séparé au-dessus
 \end_deeper
 \begin_layout AgainFrame
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1522,7 +1522,7 @@ Fondamentalement, les recouvrements permettent de 
modifier le contenu d'un
 
 \begin_layout Itemize
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1551,7 +1551,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1737,7 +1737,7 @@ Spécifications de {recouvrement|action}
 
 \begin_layout Overprint
 \begin_inset Argument item:1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1806,7 +1806,7 @@ modes
 \end_deeper
 \begin_layout Overprint
 \begin_inset Argument item:1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1963,7 +1963,7 @@ Spécifications de recouvrement
 \begin_deeper
 \begin_layout Quote
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2047,7 +2047,7 @@ caché
 \begin_deeper
 \begin_layout Quote
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2171,7 +2171,7 @@ transparent
 \begin_deeper
 \begin_layout Quote
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2306,7 +2306,7 @@ g.,
 \begin_deeper
 \begin_layout Itemize
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2328,7 +2328,7 @@ trois
 
 \begin_layout Itemize
 \begin_inset Argument item:2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2369,7 +2369,7 @@ Beamer
 
 \begin_layout Frame
 \begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2464,7 +2464,7 @@ Un bloc
 
 \begin_layout Frame
 \begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2656,7 +2656,7 @@ Beamer
 \begin_deeper
 \begin_layout Uncover
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2692,7 +2692,7 @@ Découvrir
 \end_deeper
 \begin_layout Only
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2730,7 +2730,7 @@ bouge
 
 \begin_layout Overprint
 \begin_inset Argument item:1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2761,7 +2761,7 @@ Surimpression
 \end_deeper
 \begin_layout Overprint
 \begin_inset Argument item:1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2878,7 +2878,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2902,7 +2902,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2952,7 +2952,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -2986,7 +2986,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3020,7 +3020,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3031,7 +3031,7 @@ status collapsed
 
 
 \begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 différent
@@ -3124,7 +3124,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3144,7 +3144,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3164,7 +3164,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3184,7 +3184,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3203,7 +3203,7 @@ structurée
 
 \begin_layout Block
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3338,7 +3338,7 @@ indices
 \begin_deeper
 \begin_layout Block
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3366,7 +3366,7 @@ Un bloc d'usage général
 
 \begin_layout ExampleBlock
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3402,7 +3402,7 @@ exemples
 
 \begin_layout AlertBlock
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3498,7 +3498,7 @@ Séparateur
 \begin_deeper
 \begin_layout Block
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3614,7 +3614,7 @@ Texte de théorème complémentaire
 \begin_deeper
 \begin_layout Example
 \begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
 il est mauvais!
@@ -3915,7 +3915,7 @@ beamer
 
 \begin_layout Frame
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -3990,7 +3990,7 @@ article
 
 \begin_layout Frame
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -4117,7 +4117,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -4137,7 +4137,7 @@ status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -4152,19 +4152,13 @@ seulement dans l'article
 \end_inset
 
  via 
-\lang english
-
 \begin_inset Flex Alert
 status collapsed
 
 \begin_layout Plain Layout
 \noindent
 Édition\SpecialChar menuseparator
-Style de texte
-\lang english
-\SpecialChar menuseparator
-
-\lang french
+Style de texte\SpecialChar menuseparator
 Seulement
 \end_layout
 
@@ -4226,16 +4220,12 @@ ModePrésentation
 \begin_deeper
 \begin_layout Itemize
 Ou vous pouvez décider qu'une 
-\lang english
-
 \begin_inset Flex Emphasize
 status collapsed
 
 \begin_layout Plain Layout
-
-\lang english
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -4244,22 +4234,18 @@ presentation
 
 \end_inset
 
-
-\lang french
 mise en évidence
 \end_layout
 
 \end_inset
 
-
-\lang french
  n'apparaîtra que dans la présentation, une 
 \begin_inset Flex Bold
 status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -4450,8 +4436,11 @@ status collapsed
 \begin_layout Plain Layout
 Document\SpecialChar menuseparator
 Paramètres\SpecialChar menuseparator
-Préambule \SpecialChar LaTeX
+Préambule
+\begin_inset space ~
+\end_inset
 
+LaTeX
 \end_layout
 
 \end_inset
@@ -4666,7 +4655,7 @@ newblock
 \begin_deeper
 \begin_layout FrameTitle
 \begin_inset Argument 1
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
diff --git a/lib/examples/fr/xyfigure.png b/lib/examples/fr/xyfigure.png
index 3cd0210..cd937cd 100644
Binary files a/lib/examples/fr/xyfigure.png and b/lib/examples/fr/xyfigure.png 
differ
diff --git a/lib/examples/ja/beamer.lyx b/lib/examples/ja/beamer.lyx
index 5d3148d..c8d6034 100644
--- a/lib/examples/ja/beamer.lyx
+++ b/lib/examples/ja/beamer.lyx
@@ -3845,8 +3845,7 @@ status collapsed
 \begin_layout Plain Layout
 文書\SpecialChar menuseparator
 設定\SpecialChar menuseparator
-\SpecialChar LaTeX
-プリアンブル
+LaTeXプリアンブル
 \end_layout
 
 \end_inset

Reply via email to