commit 08fd1a8131ce1541f31d34626de616f328a48e3f
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Feb 12 18:51:48 2018 +0100

    Customization.lyx: distribute all tracked changes
---
 lib/doc/Customization.lyx    |   57 ++++++------------------------------------
 lib/doc/es/Customization.lyx |   52 ++++++++++++++++++++++++++-----------
 lib/doc/fr/Customization.lyx |   56 +++++++++++++++++++++++++++++++---------
 lib/doc/ja/Customization.lyx |   44 ++++++++++++++++++++++++++++---
 4 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0156672..40b32b4 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -22951,11 +22950,7 @@ The second sort of special definition might look like 
this:
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060160
-B
-\change_unchanged
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
@@ -22966,29 +22961,19 @@ This defines a translatable piece of text, which 
allows relevant parts of
 status collapsed
 
 \begin_layout Plain Layout
-%
-\change_inserted -712698321 1517060167
-B
-\change_unchanged
-_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- 
-\change_inserted -712698321 1517060791
-Note that there are two different translation paths: All definitions starting
+ Note that there are two different translation paths: All definitions starting
  with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060380
 B_
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -23002,19 +22987,11 @@ B_
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060574
 _addtobib Add to bibliography only.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-Several of these 
-\change_inserted -712698321 1517060688
-translatable strings 
-\change_unchanged
-are predefined in 
+Several of these translatable strings are predefined in 
 \begin_inset Flex Code
 status collapsed
 
@@ -23040,17 +23017,7 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-So here then is an example that use
-\change_inserted -712698321 1517061156
-s
-\change_unchanged
- 
-\change_deleted -712698321 1517061147
-all
-\change_inserted -712698321 1517061148
-several of
-\change_unchanged
- these features:
+So here then is an example that uses several of these features:
 \begin_inset VSpace defskip
 \end_inset
 
@@ -23061,11 +23028,7 @@ several of
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %
-\change_inserted -712698321 1517060173
-B
-\change_unchanged
-_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -23089,11 +23052,7 @@ author
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060231
-B
-\change_unchanged
-_edtext
+B_edtext
 \end_layout
 
 \end_inset
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index de49e8a..4904591 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -23076,60 +23076,80 @@ El segundo tipo especial de definición sería como:
 \end_layout
 
 \begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
 Esto define un trozo de texto traducible, que permite traducir partes 
relevantes
- de la bibliografía
-\lang english
- or citation
-\lang spanish
-.
+ de la bibliografía o de la cita.
  Puede incluirse en una definición tratándolo como una clave: 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-%_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- Varios de estos están predefinidos en 
+ 
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
 \end_layout
 
 \end_inset
 
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
 
 \lang english
- and the diverse 
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+Varios de estos cadenas de caracteres traducible están predefinidos en 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
 
-\lang english
+\end_inset
+
+ y en los diversos archivos 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
 *.citeengine
 \end_layout
 
 \end_inset
 
- files
-\lang spanish
 .
  Advertiremos que no son macros en el sentido definido.
  No se expandirán.
 \end_layout
 
 \begin_layout Standard
-Aquí hay, pues, un ejemplo que usa todas estas características:
+Aquí hay, pues, un ejemplo que usa varias estas características:
 \begin_inset VSpace defskip
 \end_inset
 
@@ -23140,7 +23160,7 @@ Aquí hay, pues, un ejemplo que usa todas estas 
características:
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -23163,7 +23183,7 @@ author
 status collapsed
 
 \begin_layout Plain Layout
-_edtext
+B_edtext
 \end_layout
 
 \end_inset
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 8b9c3b9..c6e5ed2 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -25194,9 +25194,7 @@ Le second type de définitions particulières se présente 
comme ceci:
 \end_layout
 
 \begin_layout LyX-Code
-
-\lang english
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
@@ -25212,45 +25210,77 @@ Ceci définit un segment de texte susceptible de 
traduction, ce qui permet
 status collapsed
 
 \begin_layout Plain Layout
-%_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- Plusieurs d'entre elles sont prédéfinies dans 
+ 
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
 \end_layout
 
 \end_inset
 
-.
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
+
+\lang english
+_addtobib Add to bibliography only.
+\end_layout
 
+\begin_layout Standard
+Plusieurs d'entre elles 
 \lang english
- and the diverse 
+translatable strings
+\lang french
+ sont prédéfinies dans 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
 
+\end_inset
+
+ et 
 \lang english
+the diverse
+\lang french
+ fichiers 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
 *.citeengine
 \end_layout
 
 \end_inset
 
- files
-\lang french
+.
  Notez bien que ce ne sont pas des macro-instructions, au sens défini 
ci-dessus:
  elles ne seront pas interprétées.
 \end_layout
 
 \begin_layout Standard
-Voici donc un exemple utilisant toutes ces fonctionnalités:
+Voici donc un exemple utilisant variés ces fonctionnalités:
 \begin_inset VSpace defskip
 \end_inset
 
@@ -25261,7 +25291,7 @@ Voici donc un exemple utilisant toutes ces 
fonctionnalités:
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -25284,7 +25314,7 @@ author
 status collapsed
 
 \begin_layout Plain Layout
-_edtext
+B_edtext
 \end_layout
 
 \end_inset
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 15c82bf..9c2c824 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -20296,7 +20296,7 @@ status collapsed
 \end_layout
 
 \begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
@@ -20305,12 +20305,46 @@ _pptext pp.
 status collapsed
 
 \begin_layout Plain Layout
-%_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
-のように,これをキーとして扱って,定義の中に入れることもできます.これらのうちいくつかは,
+のように,これをキーとして扱って,定義の中に入れることもできます.
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+B_
+\end_layout
+
+\end_inset
+
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
+
+\lang english
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+これらのうちいくつかは
+\lang english
+translatable strings
+\lang japanese
+,
 \begin_inset Flex Code
 status collapsed
 
@@ -20345,7 +20379,7 @@ status collapsed
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -20387,7 +20421,7 @@ editor
 status collapsed
 
 \begin_layout Plain Layout
-_edtext
+B_edtext
 \end_layout
 
 \end_inset

Reply via email to