From 76678b66d4b67f56204ced0b7ed9dc978bdb26af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 14 May 2013 23:57:33 +0200
Subject: [PATCH] UserGuide.lyx: next revision step

sec. 6.13 - 6.18
---
 lib/doc/UserGuide.lyx    | 134 ++++++++++++++++++++++++---------------
 lib/doc/de/UserGuide.lyx |  30 +++++++--
 lib/doc/es/UserGuide.lyx |  91 ++++++++++++++++++++------
 lib/doc/fr/UserGuide.lyx |  81 +++++++++++++++++------
 lib/doc/ja/UserGuide.lyx |  89 ++++++++++++++++++++++++--
 5 files changed, 321 insertions(+), 104 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 7b085a23d9..27cebac5c0 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -144,7 +144,6 @@ enumitem
 \html_css_as_file 0
 \html_be_strict true
 \author -712698321 "Jürgen Spitzmüller" 
-\author 2090807402 "usti" 
 \end_header
 
 \begin_body
@@ -30430,7 +30429,7 @@ The normal text on the page goes here.
 <cell multicolumn="2" alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
-\begin_layout 
+\begin_layout Plain Layout
 
 \end_layout
 
@@ -30439,7 +30438,7 @@ The normal text on the page goes here.
 <cell multicolumn="2" alignment="center" valignment="top" rightline="true" usebox="none">
 \begin_inset Text
 
-\begin_layout 
+\begin_layout Plain Layout
 
 \end_layout
 
@@ -32114,17 +32113,17 @@ LyX has a built-in spell checker.
  Tools\SpecialChar \menuseparator
 Spellchecker
 \family default
-, the key 
+, the 
 \family sans
 F7
 \family default
- or the toolbar button 
+ key or the toolbar button 
 \begin_inset Info
 type  "icon"
 arg   "dialog-show spellchecker"
 \end_inset
 
- starts the spell checking from either the current cursor position or the
+ start the spell checking from either the current cursor position or the
  beginning of the currently selected text.
  A sidebar will appear showing any incorrect (or unknown) word found, allowing
  you to edit and replace it in a second line.
@@ -32136,7 +32135,7 @@ n, if any could be found.
 \family sans
 Replacement
 \family default
- field, double-click directly invokes the replacement.
+ field, double-clicking directly invokes the replacement.
  Unknown but correctly typed words can be added to the personal dictionary.
 \end_layout
 
@@ -32151,8 +32150,21 @@ Settings
  You can specify the language of a word in the spellchecker dialog by choosing
  a different one at the top of the dialog.
  LyX can correctly spell check documents containing multiple languages.
- This works if you have marked the different languages appropriately and
- have the spell checker dictionaries installed.
+ This works if you have set the language of the text parts using the 
+\family sans
+Text
+\begin_inset space ~
+\end_inset
+
+Style
+\family default
+ dialog (
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
+\end_inset
+
+) and have the spell checker dictionaries installed.
  LyX automatically switches to the appropriate dictionary file.
 \end_layout
 
@@ -32201,13 +32213,15 @@ Further Settings
 \end_layout
 
 \begin_layout Standard
-In LyX's preferences dialog under 
+In the menu 
 \family sans
+Tools\SpecialChar \menuseparator
+Preferences\SpecialChar \menuseparator
 Language
 \begin_inset space ~
 \end_inset
 
-Setting\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
 Spellchecker
 \family default
  you can set the following things:
@@ -32286,7 +32300,7 @@ compound
 \begin_inset space ~
 \end_inset
 
-words Prevent the spell checker from complaining about compounded words
+words Prevents the spell checker from complaining about compounded words
  like 
 \begin_inset Quotes eld
 \end_inset
@@ -32303,10 +32317,10 @@ Spellcheck
 \begin_inset space ~
 \end_inset
 
-continuously Check the spelling of your document as you type it.
+continuously Checks the spelling of your document as you type it.
  Misspelled words get underlined with a dotted red line.
  By right-clicking on an underlined word, suggestions from the spellchecker
- appear in the context menu.
+ appear in a context menu.
  Choosing one of them will replace the misspelled word with the suggested
  word.
 \end_layout
@@ -32324,7 +32338,7 @@ and
 \begin_inset space ~
 \end_inset
 
-comments If enabled, the spelling of non-printed document contents is checked
+comments If enabled, the spelling of non-printed document content is checked
  as well.
 \end_layout
 
@@ -32491,7 +32505,7 @@ arg   "thesaurus-entry"
  selected.
  A dialog pops up showing you probably related words that you can use as
  a replacement.
- The proposals are grouped into categories.
+ The suggestions are grouped into categories.
  Note that, for some languages (such as English), the thesaurus does not
  only show equivalent words (synonyms), but also generic terms (such as
  
@@ -32560,15 +32574,7 @@ e.
 
 the form that is used in the dictionaries (for many languages: first person
  singular indicative active for nouns, infinitive for verbs).
- For example looking up the word form
-\change_deleted 2090807402 1338765333
-s 
-\emph on
-reports
-\emph default
- or
-\change_unchanged
- 
+ For example, looking up the word form 
 \emph on
 reporting
 \emph default
@@ -32577,22 +32583,7 @@ reporting
 report
 \emph default
 .
- 
-\change_inserted 2090807402 1338765282
-The thesuarus is able to resolve inflected forms (so if you enter 
-\emph on
-reports
-\emph default
-, it will resolve it to the form 
-\emph on
-report
-\emph default
- which is in the dictionary).
- However, this may not always work.
- So if you do not get any results for inflected forms, try the lemma form.
-
-\change_unchanged
- Your best bet is to highlight only the relevant parts of such word (e.
+ Your best bet is to highlight only the relevant part of such a word (e.
 \begin_inset space \thinspace{}
 \end_inset
 
@@ -32608,9 +32599,9 @@ report
 \emph on
 report
 \emph default
-s), then you get proposals without adjusting the query in the dialog, and
- also the replacement will probably be correct (as only the highlighted
- part will be replaced, thus the ending remains).
+s); then you will get suggestions without needing to adjust the query in
+ the dialog, and also the replacement will probably be correct (as only
+ the highlighted part will be replaced; thus the ending remains).
 \end_layout
 
 \begin_layout Section
@@ -32681,19 +32672,22 @@ canceled text
 \color inherit
  is a deletion.
  The color depends on the author that made the change.
- You can change the color in LyX's preferences dialog under 
+ You can change the color in 
 \family sans
+Tools\SpecialChar \menuseparator
+Preferences\SpecialChar \menuseparator
 Look
 \begin_inset space ~
 \end_inset
 
-and
+&
 \begin_inset space ~
 \end_inset
 
 feel
 \family default
-, 
+\SpecialChar \menuseparator
+
 \family sans
 Colors
 \family default
@@ -32757,8 +32751,7 @@ Toolbar ! Review
 \end_layout
 
 \begin_layout Standard
-The review toolbar as shown above contains from left to right the following
- buttons:
+The review toolbar as shown above contains the following buttons:
 \end_layout
 
 \begin_layout Standard
@@ -33115,7 +33108,18 @@ arg   "note-insert"
 \family sans
 Insert\SpecialChar \menuseparator
 Note\SpecialChar \menuseparator
-LyX
+Ly
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{}
+\end_layout
+
+\end_inset
+
+X
 \begin_inset space ~
 \end_inset
 
@@ -33173,6 +33177,27 @@ Note
 
 \end_layout
 
+\begin_layout Standard
+Not all changes are (yet) visualized, especially no format changes like
+ from 
+\emph on
+normal
+\emph default
+ to 
+\emph on
+bold
+\emph default
+ font or 
+\emph on
+Standard
+\emph default
+ to 
+\emph on
+Description
+\emph default
+ paragraph.
+\end_layout
+
 \begin_layout Standard
 The review toolbar helps you to accept, reject, or merge changes – highlight
  the change and press one of the desired toolbar buttons.
@@ -33190,7 +33215,7 @@ The toolbar has two buttons to handle notes because notes are often important
 \end_layout
 
 \begin_layout Standard
-To show the made changes in the output you need the LaTeX package 
+To show the changes made in the output you need the LaTeX package 
 \series bold
 dvipost
 \series default
@@ -33217,6 +33242,13 @@ key "TeXCatalogue"
 
 \begin_layout Section
 Comparison of Documents
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Comparison-of-Documents"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 5c7028356b..8aba72e15a 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -32860,11 +32860,20 @@ Einstellungen
 \family default
  eingestellt ist.
  Die Sprache eines Wortes kann in der Rechtschreibprüfungs-Seitenleiste
- ausgewählt werden, indem man in der Dropdown-Box eine andere Sprache auswählt
+ ausgewählt werden, indem man in der Dropdown-Box eine andere Sprache auswählt.
  LyX kann auch Dokumente, die Text in mehreren Sprachen enthalten, korrekt
  prüfen.
- Dies funktioniert, wenn man die verschiedenen Sprachen entsprechend markiert
- und die Rechtschreibprüfungs-Wörterbücher installiert hat.
+ Dies funktioniert, wenn man die Sprache der Textstellen mit dem 
+\family sans
+Textstil
+\family default
+-Dialog (
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
+\end_inset
+
+) festlegt und die Rechtschreibprüfungs-Wörterbücher installiert hat.
  LyX wechselt dann automatisch die Wörterbuchdateien.
 \end_layout
 
@@ -32911,8 +32920,10 @@ Weitere Einstellungen
 \end_layout
 
 \begin_layout Standard
-In LyXs Einstellungen Dialog unter 
+Im Menü 
 \family sans
+Werkzeuge\SpecialChar \menuseparator
+Einstellungen\SpecialChar \menuseparator
 Spracheinstellungen\SpecialChar \menuseparator
 Rechtschreibprüfung
 \family default
@@ -33370,7 +33381,7 @@ durchgestrichener Text
 \color inherit
 eine Löschung.
  Die Farbe hängt vom Autor der Änderung ab.
- Die Farben können Sie in 
+ Die Farben können Sie im Menü 
 \family sans
 Werkzeuge\SpecialChar \menuseparator
 Einstellungen\SpecialChar \menuseparator
@@ -33859,8 +33870,6 @@ Standardabsatz
 Beschreibung
 \emph default
 .
- Das kann man jedoch anzeigen lassen, indem man den Textteil dupliziert,
- das Original löscht und die Kopie ändert.
 \end_layout
 
 \begin_layout Standard
@@ -33909,6 +33918,13 @@ key "TeX-Katalog"
 
 \begin_layout Section
 Vergleich von Dokumenten
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Vergleich-von-Dokumenten"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 15e0573a67..44bb462cfe 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -27518,15 +27518,8 @@ Bibliografía
 \family default
  o en 
 \family sans
-\lang english
-Tools
-\lang spanish
-\SpecialChar \menuseparator
-
-\lang english
-Preferences
-\lang spanish
-\SpecialChar \menuseparator
+Herramientas\SpecialChar \menuseparator
+Preferencias\SpecialChar \menuseparator
 Salidas\SpecialChar \menuseparator
 LaT
 \begin_inset ERT
@@ -32653,8 +32646,29 @@ Configuración
  del corrector.
  LyX puede revisar correctamente documentos con varios idiomas alternando
  entre los diccionarios pertinentes.
- Esto funciona si los diferentes idiomas se han marcado adecuadamente y
- están instalados los diccionarios de los idiomas correspondientes.
+ Esto funciona si 
+\lang english
+you have set the 
+\lang spanish
+idioma
+\lang english
+ of the text parts using the 
+\family sans
+Text
+\begin_inset space ~
+\end_inset
+
+Style
+\family default
+ dialog
+\lang spanish
+ (
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
+\end_inset
+
+) y están instalados los diccionarios de los idiomas correspondientes.
 \end_layout
 
 \begin_layout Standard
@@ -32708,8 +32722,10 @@ Configuración adicional
 \end_layout
 
 \begin_layout Standard
-En las preferencias de LyX, 
+En el menú 
 \family sans
+Herramientas\SpecialChar \menuseparator
+Preferencias\SpecialChar \menuseparator
 Configuración
 \begin_inset space ~
 \end_inset
@@ -33155,13 +33171,11 @@ texto tachado
 \color inherit
  es texto borrado.
  El color depende del autor que hizo el cambio.
- Puedes cambiar estos colores en el diálogo de las preferencias de LyX,
- en 
-\family sans
-Apariencia
-\family default
-, 
+ Puedes cambiar estos colores en el menú 
 \family sans
+Herramientas\SpecialChar \menuseparator
+Preferencias\SpecialChar \menuseparator
+Apariencia\SpecialChar \menuseparator
 Colores
 \family default
 .
@@ -33699,6 +33713,29 @@ siguiente
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Not all changes are (yet) visualized, especially no format changes like
+ from 
+\emph on
+normal
+\emph default
+ to 
+\emph on
+bold
+\emph default
+ font or 
+\emph on
+Standard
+\emph default
+ to 
+\emph on
+Description
+\emph default
+ paragraph.
+\end_layout
+
 \begin_layout Standard
 La barra de revisión ayuda a aceptar, descartar o fusionar cambios, para
  ello selecciona el cambio y pulsa el botón adecuado.
@@ -33741,6 +33778,13 @@ key "TeXCatalogue"
 
 \begin_layout Section
 Comparación de documentos
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Comparación-de-documentos"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
@@ -33929,10 +33973,15 @@ S.
  de teclado alternativo configurando LyX para que use un teclado italiano.
  En el diálogo 
 \family sans
+Herramientas\SpecialChar \menuseparator
+Preferencias\SpecialChar \menuseparator
+
+\lang english
+Editing
+\lang spanish
+\SpecialChar \menuseparator
+
 \lang english
-Tools\SpecialChar \menuseparator
-Preferences\SpecialChar \menuseparator
-Editing\SpecialChar \menuseparator
 Keyboard/Mouse
 \family default
 \lang spanish
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index a8e26781ee..7eda268192 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -28149,15 +28149,8 @@ Bibliographie
 \family default
  ou dans 
 \family sans
-\lang english
-Tools
-\lang french
-\SpecialChar \menuseparator
-
-\lang english
-Preferences
-\lang french
-\SpecialChar \menuseparator
+Outils\SpecialChar \menuseparator
+Préférences\SpecialChar \menuseparator
 Sorties
 \family default
 \SpecialChar \menuseparator
@@ -33725,8 +33718,30 @@ Langue
 \family default
  en haut de la fenêtre latérale du correcteur.
  LyX peut effectuer la correction dans les documents multilingues, si vous
- avez marqué le texte avec la langue appropriée et si les dictionnaires
- adéquats sont installés: LyX commute automatiquement vers le bon dictionnaire.
+ 
+\lang english
+have set
+\lang french
+ le langue 
+\lang english
+of the text parts using the 
+\family sans
+Text
+\begin_inset space ~
+\end_inset
+
+Style
+\family default
+ dialog
+\lang french
+ (
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
+\end_inset
+
+) et si les dictionnaires adéquats sont installés: LyX commute automatiquement
+ vers le bon dictionnaire.
 \end_layout
 
 \begin_layout Standard
@@ -33780,8 +33795,10 @@ Autres paramètres
 \end_layout
 
 \begin_layout Standard
-La rubrique 
+Le menu 
 \family sans
+Outils\SpecialChar \menuseparator
+Préférences\SpecialChar \menuseparator
 Paramètres de langue\SpecialChar \menuseparator
 Correcteur
 \begin_inset space ~
@@ -34380,13 +34397,11 @@ du texte barré
 \color inherit
 est une suppression.
  La couleur dépend de l'auteur de la modification.
- Vous pouvez changer les couleurs dans les préférences de LyX dans la rubrique
- 
-\family sans
-Apparence
-\family default
-, 
+ Vous pouvez changer les couleurs dans le menu 
 \family sans
+Outils\SpecialChar \menuseparator
+Préférences\SpecialChar \menuseparator
+Apparence\SpecialChar \menuseparator
 Couleurs
 \family default
 .
@@ -34942,6 +34957,29 @@ suivante
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Not all changes are (yet) visualized, especially no format changes like
+ from 
+\emph on
+normal
+\emph default
+ to 
+\emph on
+bold
+\emph default
+ font or 
+\emph on
+Standard
+\emph default
+ to 
+\emph on
+Description
+\emph default
+ paragraph.
+\end_layout
+
 \begin_layout Standard
 La barre d'outils de suivi des modifications vous aide à accepter, rejeter
  ou fusionner les modifications.
@@ -34990,6 +35028,13 @@ key "TeXCatalogue"
 
 \begin_layout Section
 Comparaison de documents
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Comparaison-de-documents"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index d37ac8f570..cd8925e841 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -26228,8 +26228,29 @@ arg   "dialog-show spellchecker"
 \family default
 ダイアログで設定される文書言語によって決定されます。文書言語用の辞書を持っていない場合には、スペルチェックを実行しようとするとエラーメッセージが表示されます。ス
 ペルチェッカーダイアログの一番上の欄で、いずれかの言語を選ぶことで、単語の言語を指定することができます。LyXは複数の言語を含む文書でも正しくスペルチェックを行
-うことができます。これは、各言語の箇所を正しくマークしており、対応するスペルチェッカー辞書が導入済みでなくては、機能しません。それが為されていれば、LyXは、自
-動的に適当な辞書ファイルを切り替えて用います。
+うことができます。
+\lang english
+This works if you have set the language of the text parts using the 
+\family sans
+Text
+\begin_inset space ~
+\end_inset
+
+Style
+\family default
+ dialog
+\lang japanese
+ (
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
+\end_inset
+
+) 
+\lang english
+and have the spell checker dictionaries installed
+\lang japanese
+。それが為されていれば、LyXは、自動的に適当な辞書ファイルを切り替えて用います。
 \end_layout
 
 \begin_layout Standard
@@ -26321,8 +26342,14 @@ dicts
 \end_layout
 
 \begin_layout Standard
-LyXの設定ダイアログの
+
+\lang english
+In the menu 
 \family sans
+Tools\SpecialChar \menuseparator
+Preferences
+\lang japanese
+\SpecialChar \menuseparator
 言語設定\SpecialChar \menuseparator
 スペルチェッカー
 \family default
@@ -26668,11 +26695,29 @@ name "sec:変更追跡機能"
 取り消し文章
 \strikeout default
 \color inherit
-のように表示されるようになります。色は、変更した執筆者によって異なります。色は、LyX設定ダイアログの
+のように表示されるようになります。色は、変更した執筆者によって異なります。
+\lang english
+You can change the color in 
 \family sans
-操作性・色
+Tools\SpecialChar \menuseparator
+Preferences\SpecialChar \menuseparator
+Look
+\begin_inset space ~
+\end_inset
+
+&
+\begin_inset space ~
+\end_inset
+
+feel
 \family default
-面で変更できます
+\SpecialChar \menuseparator
+
+\family sans
+Colors
+\family default
+\lang japanese
+。
 \begin_inset Index idx
 status collapsed
 
@@ -26682,7 +26727,7 @@ status collapsed
 
 \end_inset
 
-。執筆者と変更の日時は、カーソルを変更箇所にあわせると、LyXのステータスバーに表示されます。ツールバーボタン
+執筆者と変更の日時は、カーソルを変更箇所にあわせると、LyXのステータスバーに表示されます。ツールバーボタン
 \begin_inset Info
 type  "icon"
 arg   "changes-merge"
@@ -27063,6 +27108,29 @@ arg   "note-next"
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Not all changes are (yet) visualized, especially no format changes like
+ from 
+\emph on
+normal
+\emph default
+ to 
+\emph on
+bold
+\emph default
+ font or 
+\emph on
+Standard
+\emph default
+ to 
+\emph on
+Description
+\emph default
+ paragraph.
+\end_layout
+
 \begin_layout Standard
 校閲ツールバーは、変更を承認・却下したり統合したりするのに便利です。変更点を選択して、希望するツールバーボタンを押してください。変更を統合する際には、ウィンドウ
 が現れて、現在のカーソル位置の次の変更に関する情報を表示しますので、特定の変更点をわざわざ選択する必要がありません。統合ウィンドウでは、変更を承認するか却下する
@@ -27100,6 +27168,13 @@ key "TeXCatalogue"
 
 \begin_layout Section
 文書比較
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:文書比較"
+
+\end_inset
+
+
 \begin_inset Index idx
 status collapsed
 
-- 
2.39.5