From a69b261919a61e2d95ee3f063613c4431e76f062 Mon Sep 17 00:00:00 2001 From: jpc Date: Tue, 29 Aug 2017 11:48:07 +0200 Subject: [PATCH] Copy new paragrpah in section C.2.2.1 in localized UserGuide files Remove CT, translate in French file and update Changelog --- lib/doc/Changelog-UserGuide-LyX_23x.txt | 15 +++--- lib/doc/UserGuide.lyx | 9 +--- lib/doc/es/UserGuide.lyx | 54 ++++++++++++++++++++- lib/doc/fr/UserGuide.lyx | 62 +++++++++++++++++++++++++ lib/doc/ja/UserGuide.lyx | 54 ++++++++++++++++++++- 5 files changed, 178 insertions(+), 16 deletions(-) diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt index beb9b5b5fb..c873c3d977 100644 --- a/lib/doc/Changelog-UserGuide-LyX_23x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt @@ -2,15 +2,18 @@ Modified: -first step: -- sec. 3.9.3.2: section completely rewritten -- sec. 6.1: new reference format and new options +first step (not G): +- sec. 3.9.3.2: section completely rewritten (not F) +- sec. 6.1: new reference format and new options (not F) - sec. 6.5: section and its subsections completely rewritten -- sec. 6.8: new feature "inverted branches" -- sec. B.12 new sentences -- sec. C.1.2.3 new sentence +- sec. 6.8: new feature "inverted branches" (not F) +- sec. B.12 new sentences (not F) +- sec. C.1.2.3 new sentence (not F) +second step +- sec. C.2.2.1 new paragraph (not F, not G) +============= For LyX 2.2.3: - sec. 2.5.1: (not French) new sentence diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 4dffd1b1d1..f13d52e8e1 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -140,12 +140,11 @@ enumitem \papercolumns 1 \papersides 2 \paperpagestyle default -\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 @@ -46099,13 +46098,9 @@ key combination \end_inset -\change_inserted -712698321 1503738349 - \end_layout \begin_layout Standard - -\change_inserted -712698321 1503740883 Note, though, that the key combination definition uses a specific syntax. This applies to the designators of specific modifier keys (e. \begin_inset space \thinspace{} @@ -46153,8 +46148,6 @@ M-S-colon these specifics. \SpecialChar LyX transforms your input to the correct syntax. -\change_unchanged - \end_layout \begin_layout Subsection diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 5a75e101a5..0d1b666562 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -186,7 +186,7 @@ literal "false" \begin_inset Newline newline \end_inset -Versión 2.2.x +Versión 2.3.x \end_layout \begin_layout Standard @@ -46367,6 +46367,58 @@ key combination \end_layout +\begin_layout Standard + +\lang english +Note, though, that the key combination definition uses a specific syntax. + This applies to the designators of specific modifier keys (e. +\begin_inset space \thinspace{} +\end_inset + +g., +\family typewriter +M +\family default +, +\family typewriter +S +\family default +, +\family typewriter +C +\family default + for +\family sans +Meta/Alt +\family default +, +\family sans +Shift +\family default +, +\family sans +Ctrl +\family default +, respectively) as well as to the other keys. + Note particularly that you cannot use non-alphanumeric characters directly + in the definition of the key combination, but must use commands following + the Xlib standard instead (please refer to the existing bind files for + a model). + So if you wanted to bind a command to the key combination +\family sans +Alt+Shift+: +\family default +, you needed to specify it as +\family typewriter +M-S-colon +\family default +. + If you use the dialog to edit key bindings, you don't have to care for + these specifics. + \SpecialChar LyX + transforms your input to the correct syntax. +\end_layout + \begin_layout Subsection Teclado / Ratón \begin_inset CommandInset label diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index fb16a25c05..a3d79e6658 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -9030,12 +9030,14 @@ Verbatim \end_layout \begin_layout Verbatim + This is Verbatim. \end_layout \begin_layout Verbatim \noindent \align block + The following 2 lines are empty: \end_layout @@ -9048,6 +9050,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -9080,6 +9083,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -47854,6 +47858,64 @@ fonction-lyx \end_layout +\begin_layout Standard +Notez cependant que la définition des la combinaison de touches nécessite + une syntaxe spécifique pour la désignation de touches modificatrices particuliè +res (e. +\begin_inset space \thinspace{} +\end_inset + +g., +\family typewriter +M +\family default +, +\family typewriter +S +\family default +, +\family typewriter +C +\family default + pour +\family sans +Meta/Alt +\family default +, +\family sans +Shift/Maj, +\family default + +\family sans +Ctrl +\family default +, respectivement) ainsi que pour les autres touches. + Notez en particulier que vous ne pouvez pas utiliser directement dans la + combinaison de touches des caractères qui ne soient pas alphanumériques: + au contraire, vous devez utiliser des commandes du standard +\family sans +Xlib +\family default + (voyez les fichiers d'association +\emph on +bind +\emph default + existants pour un exemple). + Donc si vous souhaitez associer une commande à la combinaison +\family sans +Alt+Maj+: +\family default +, il vous faut la spécifier sous la forme +\family typewriter +M-S-colon +\family default +. + Si vous utilisez la fenêtre de dialogue pour modifier ou saisir les association +s de touches, vous n'avez pas à vous inquiéter de ceci, \SpecialChar LyX + convertit votre + saisie dans le syntaxe correcte. +\end_layout + \begin_layout Subsection Clavier / Souris \begin_inset CommandInset label diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 08936148a7..4581c3c7a4 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -212,7 +212,7 @@ literal "false" \begin_inset Newline newline \end_inset -第2.2.x版 +第2.3.x版 \begin_inset Note Note status collapsed @@ -39340,6 +39340,58 @@ bind のようになっています． \end_layout +\begin_layout Standard + +\lang english +Note, though, that the key combination definition uses a specific syntax. + This applies to the designators of specific modifier keys (e. +\begin_inset space \thinspace{} +\end_inset + +g., +\family typewriter +M +\family default +, +\family typewriter +S +\family default +, +\family typewriter +C +\family default + for +\family sans +Meta/Alt +\family default +, +\family sans +Shift +\family default +, +\family sans +Ctrl +\family default +, respectively) as well as to the other keys. + Note particularly that you cannot use non-alphanumeric characters directly + in the definition of the key combination, but must use commands following + the Xlib standard instead (please refer to the existing bind files for + a model). + So if you wanted to bind a command to the key combination +\family sans +Alt+Shift+: +\family default +, you needed to specify it as +\family typewriter +M-S-colon +\family default +. + If you use the dialog to edit key bindings, you don't have to care for + these specifics. + \SpecialChar LyX + transforms your input to the correct syntax. +\end_layout + \begin_layout Subsection キーボード/マウス \begin_inset CommandInset label -- 2.39.5