From 6e54bb29548cbdb5db766b98c44b92235d97a557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sun, 6 Dec 2015 04:44:33 +0100
Subject: [PATCH] Customization.lyx: merge all recent changes

---
 lib/doc/Customization.lyx                     |  65 --------
 .../attic/Changelog-Customization-LyX_22x.txt |   1 +
 lib/doc/de/Customization.lyx                  | 139 +++++++++++-----
 lib/doc/es/Customization.lyx                  | 133 ++++++++++-----
 lib/doc/fr/Customization.lyx                  | 157 ++++++++++++------
 lib/doc/ja/Customization.lyx                  | 105 ++++++++----
 6 files changed, 365 insertions(+), 235 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 62672debf2..d5c4972d41 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -120,10 +120,6 @@ logicalmkup
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
-\author -195340706 "Georg Baum"
-\author 274215730 "scott"
-\author 1414654397 "Richard Heck"
 \end_header
 
 \begin_body
@@ -9079,51 +9075,6 @@ reference "subsec:Counters"
  for details on counters.
 \end_layout
 
-\begin_layout Description
-
-\change_deleted 1414654397 1449175404
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-IfStyle
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-<style>
-\end_layout
-
-\end_inset
-
-] Modifies the properties of the given paragraph style.
- If the style does not exist, the statement is ignored.
- Must end with 
-\begin_inset Quotes eld
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-End
-\end_layout
-
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-.
-\end_layout
-
 \begin_layout Description
 \begin_inset Flex Code
 status collapsed
@@ -9267,14 +9218,10 @@ MMMMM
 \end_layout
 
 \begin_layout Description
-
-\change_inserted 1414654397 1449175421
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175415
 ModifyStyle
 \end_layout
 
@@ -9285,8 +9232,6 @@ ModifyStyle
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175410
 <style>
 \end_layout
 
@@ -9303,8 +9248,6 @@ status collapsed
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175410
 End
 \end_layout
 
@@ -9920,14 +9863,10 @@ DefaultModule
 \end_layout
 
 \begin_layout Description
-
-\change_inserted 1414654397 1449175396
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175389
 ProvideStyle
 \end_layout
 
@@ -9938,8 +9877,6 @@ ProvideStyle
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175384
 <style>
 \end_layout
 
@@ -9956,8 +9893,6 @@ status collapsed
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 1414654397 1449175384
 End
 \end_layout
 
diff --git a/lib/doc/attic/Changelog-Customization-LyX_22x.txt b/lib/doc/attic/Changelog-Customization-LyX_22x.txt
index 8d7ce931ad..1abdac532f 100644
--- a/lib/doc/attic/Changelog-Customization-LyX_22x.txt
+++ b/lib/doc/attic/Changelog-Customization-LyX_22x.txt
@@ -1,6 +1,7 @@
 Modified:
 
 - sec. 5.3.4 new sentence for "Requires"
+- sec. 5.3.4 new entry "ProvideStyle"
 - sec. 5.3.6 new items for "Argument"
 - sec. 5.3.6 new entry "ParagraphGroup"
 - sec. 5.3.6 changed ifo for "Requires"
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 2b95d4d550..c74c38bfd9 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -7498,49 +7498,6 @@ reference "subsec:Zähler"
 \begin_inset Flex Code
 status collapsed
 
-\begin_layout Plain Layout
-IfStyle
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-<Stil>
-\end_layout
-
-\end_inset
-
-] Ändert die Eigenschaften des angegebenen Paragraphstils.
- Wenn dieser nicht existiert, wird die Anweisung ignoriert.
- Muss mit 
-\begin_inset Quotes gld
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-End
-\end_layout
-
-\end_inset
-
-
-\begin_inset Quotes grd
-\end_inset
-
- beendet werden.
-\end_layout
-
-\begin_layout Description
-\begin_inset Flex Code
-status collapsed
-
 \begin_layout Plain Layout
 Input
 \end_layout
@@ -7679,6 +7636,49 @@ MMMMM
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ModifyStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<Stil>
+\end_layout
+
+\end_inset
+
+] Ändert die Eigenschaften des angegebenen Paragraphstils.
+ Wenn dieser nicht existiert, wird die Anweisung ignoriert.
+ Muss mit 
+\begin_inset Quotes gld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes grd
+\end_inset
+
+ beendet werden.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 NoCounter
 \end_layout
@@ -8296,6 +8296,59 @@ DefaultModule
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ProvideStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<Stil>
+\end_layout
+
+\end_inset
+
+] Erstellt einen neuen Paragraphstil, falls er noch nicht existiert.
+ Existiert er bereits, wird 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ProvideStyle
+\end_layout
+
+\end_inset
+
+ ignoriert.
+ Muss mit 
+\begin_inset Quotes gld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes grd
+\end_inset
+
+ beendet werden.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 Requires
 \end_layout
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index ff163441a6..ddcacedd7f 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -8900,49 +8900,6 @@ reference "subsec:Contadores"
 \begin_inset Flex Code
 status collapsed
 
-\begin_layout Plain Layout
-IfStyle
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-<estilo>
-\end_layout
-
-\end_inset
-
-] Modifica las propiedades del estilo de párrafo dado.
- Si el estilo no existe, esta sección se ignora.
- Debe acabar con 
-\begin_inset Quotes eld
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-End
-\end_layout
-
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-.
-\end_layout
-
-\begin_layout Description
-\begin_inset Flex Code
-status collapsed
-
 \begin_layout Plain Layout
 Input
 \end_layout
@@ -9089,6 +9046,49 @@ MMMMM
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ModifyStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<estilo>
+\end_layout
+
+\end_inset
+
+] Modifica las propiedades del estilo de párrafo dado.
+ Si el estilo no existe, esta sección se ignora.
+ Debe acabar con 
+\begin_inset Quotes eld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes erd
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 NoCounter
 \end_layout
@@ -9700,6 +9700,53 @@ DefaultModule
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ProvideStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<estilo>
+\end_layout
+
+\end_inset
+
+] 
+\lang english
+Creates a new paragraph style if it does not already exist.
+ If the style does exist, this section is ignored.
+
+\lang spanish
+ Debe acabar con 
+\begin_inset Quotes eld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes erd
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 Requires
 \end_layout
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 8789fc5b76..66b0ecf410 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -9089,57 +9089,6 @@ reference "subsec:Compteurs"
  pour les détails au sujet des compteurs.
 \end_layout
 
-\begin_layout Description
-
-\lang english
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-IfStyle
-\end_layout
-
-\end_inset
-
-
-\lang french
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-<style>
-\end_layout
-
-\end_inset
-
-] modifies les propriétés de style d'un paragraphe donné.
- Si le style n'existe pas, le directive est ignorée.
- Doit être fermé par 
-\begin_inset Quotes fld
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-End
-\end_layout
-
-\end_inset
-
-
-\begin_inset Quotes frd
-\end_inset
-
-.
-\end_layout
-
 \begin_layout Description
 \begin_inset Flex Code
 status collapsed
@@ -9318,6 +9267,57 @@ status collapsed
 
 \begin_layout Plain Layout
 
+\lang english
+ModifyStyle
+\end_layout
+
+\end_inset
+
+
+\lang french
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<style>
+\end_layout
+
+\end_inset
+
+] modifies les propriétés de style d'un paragraphe donné.
+ Si le style n'existe pas, le directive est ignorée.
+ Doit être fermé par 
+\begin_inset Quotes fld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes frd
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Description
+
+\lang english
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
 \lang english
 NoCounter
 \end_layout
@@ -10032,6 +10032,61 @@ status collapsed
 
 \begin_layout Plain Layout
 
+\lang english
+ProvideStyle
+\end_layout
+
+\end_inset
+
+
+\lang french
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<style>
+\end_layout
+
+\end_inset
+
+] 
+\lang english
+Creates a new paragraph style if it does not already exist.
+ If the style does exist, this section is ignored.
+
+\lang french
+ Doit être fermé par 
+\begin_inset Quotes fld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+End
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes frd
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Description
+
+\lang english
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
 \lang english
 Requires
 \end_layout
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 03538f17c1..fd7be18ddb 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -8236,39 +8236,6 @@ reference "subsec:カウンタ"
 \begin_inset Flex Code
 status collapsed
 
-\begin_layout Plain Layout
-IfStyle
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-<様式>
-\end_layout
-
-\end_inset
-
-] 与えられた段落様式の特性を修正します。様式が存在しない場合には、この節は無視されます。「
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-End
-\end_layout
-
-\end_inset
-
-」で閉じる必要があります。
-\end_layout
-
-\begin_layout Description
-\begin_inset Flex Code
-status collapsed
-
 \begin_layout Plain Layout
 Input
 \end_layout
@@ -8388,6 +8355,39 @@ MMMMM
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ModifyStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<様式>
+\end_layout
+
+\end_inset
+
+] 与えられた段落様式の特性を修正します。様式が存在しない場合には、この節は無視されます。「
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+」で閉じる必要があります。
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 NoCounter
 \end_layout
@@ -8940,6 +8940,45 @@ DefaultModule
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+ProvideStyle
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+<様式>
+\end_layout
+
+\end_inset
+
+] 
+\lang english
+Creates a new paragraph style if it does not already exist.
+ If the style does exist, this section is ignored.
+ 
+\lang japanese
+「
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+End
+\end_layout
+
+\end_inset
+
+」で閉じる必要があります。
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 Requires
 \end_layout