The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 3b62013dfa023a12e77b3ed2030e4fb5853cd4bb
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Oct 23 21:49:23 2012 +0200

    UserGuide.lyx: final update for advanced search
    
    - German UserGuide.lyx: translations
    - other UserGuide.lyx: simplifications and formatting adaptions

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 5183b22..ad2147c 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -31350,19 +31350,23 @@ Find
 Find Next
 \family default
  button at the bottom of the dialog (or just press the 
-\family sans
-Return
-\family default
+\begin_inset Info
+type  "shortcut"
+arg   "break-paragraph"
+\end_inset
+
  key).
  The entered word is found both in text mode and in math mode, and in 
emphasized
 , bold or normal face, and in both in section titles and in standard text.
  Pressing repeatedly 
-\family sans
-Enter
-\family default
+\begin_inset Info
+type  "shortcut"
+arg   "break-paragraph"
+\end_inset
+
  keeps searching forward while pressing 
 \family sans
-Shift+Enter
+Shift+Return
 \family default
  searches backwards.
 \end_layout
@@ -31462,11 +31466,11 @@ Replace
 \end_layout
 
 \begin_layout Standard
-The text segments matching the text entered in the 
+The document segments entered in the 
 \family sans
 Find
 \family default
- editor may be replaced with the text segments entered in the 
+ editor can be replaced with the text segments entered in the 
 \family sans
 Replace
 \family default
@@ -31483,14 +31487,16 @@ Replace
  
 \noun default
 press 
-\family sans
-Enter
-\family default
+\begin_inset Info
+type  "shortcut"
+arg   "break-paragraph"
+\end_inset
+
  or 
 \family sans
-Shift+Enter
+Shift+Return
 \family default
- while being in the 
+ while the cursor is in the 
 \family sans
 Replace
 \family default
@@ -31501,8 +31507,7 @@ editor.
 \end_layout
 
 \begin_layout Standard
-You can replace full-featured formatted LyX segments in place of the matching
- text segments in your document.
+You can replace with full-featured formatted LyX segments.
  Typical scenarios in which to use this capability may be (just to mention
  a few):
 \end_layout
@@ -31518,16 +31523,18 @@ func()
 \end_inset
 
  with its typewriter version 
-\family typewriter
-
 \begin_inset Quotes eld
 \end_inset
 
+
+\family typewriter
 func()
+\family default
+
 \begin_inset Quotes erd
 \end_inset
 
-;
+
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 0ad4e57..2e05c33 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -32329,29 +32329,24 @@ Ersetzen
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-The text segments matching the text entered in the 
+Dokumentsegmente, die im 
 \family sans
 Suchen
 \family default
- editor may be replaced mit the text segments entered in the 
+ Feld eingegeben wurden, können mit Segmenten ersetzt werden, die im 
 \family sans
 Ersetzen durch
 \family default
 \noun on
  
 \noun default
-editor.
- In order to find the next occurrence und replace it, click on the 
+Feld eingegeben werden.
+ Um das nächste Auftreten zu finden und dieses zu ersetzen, drückt man den
+ Knopf 
 \family sans
 Ersetzen
 \family default
- button oder alternatively
-\noun on
- 
-\noun default
-press 
+ oder drückt alternativ 
 \family sans
 Enter
 \family default
@@ -32359,30 +32354,29 @@ Enter
 \family sans
 Umschalt+Enter
 \family default
- while being in the 
+ während der Cursor sich im Feld 
 \family sans
 Ersetzen durch
 \family default
 \noun on
  
 \noun default
-editor.
+befindet.
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-You can replace full-featured formatted LyX segments in place of the matching
- text segments in your Dokument.
- Typical scenarios in which to use this capability may be (just to mention
- a few):
+Man kann mit formatierten Segmenten ersetzen.
+ Typische Szenarios in denen das nützlich ist (nur um einige zu nennen),
+ sind:
 \end_layout
 
 \begin_layout Itemize
+das Ersetzen mit einer formatierten Version des selben Wortes, z.
+\begin_inset space \thinspace{}
+\end_inset
 
-\lang english
-replacing occurrences of a word mit a benutzerdefinierten formatted version
- of the same word, zum Beispiel replacing occurrences of a name like 
+B.
+ Ersetzen des Namens 
 \begin_inset Quotes gld
 \end_inset
 
@@ -32390,24 +32384,28 @@ func()
 \begin_inset Quotes grd
 \end_inset
 
- mit its typewriter version 
-\family typewriter
-
+ mit seiner Version im Stil Schreibmaschine 
 \begin_inset Quotes gld
 \end_inset
 
+
+\family typewriter
 func()
+\family default
+
 \begin_inset Quotes grd
 \end_inset
 
-;
+
 \end_layout
 
 \begin_layout Itemize
+Änderung der mathematischen Notation, z.
+\begin_inset space \thinspace{}
+\end_inset
 
-\lang english
-performing a notation rework of mathematical symbols, zum Beispiel replacing
- occurrences of 
+B.
+ um alle Vorkommen von 
 \begin_inset Quotes gld
 \end_inset
 
@@ -32431,23 +32429,23 @@ performing a notation rework of mathematical symbols, 
zum Beispiel replacing
 \begin_inset Quotes grd
 \end_inset
 
- (you may want to enable the 
+ zu ersetzen (dabei hilft es eventuell, die Optionen 
 \family sans
-Whole words
+Ganze Wörter
 \family default
  und 
 \family sans
-Case sensitive
+Groß-/Kleinschreibung beachten
 \family default
- Optionen und disable the 
+ zu verwenden und die Option 
 \family sans
-Ignore format
+Ignoriere Format
 \family default
- Option in the 
+ im Tab 
 \family sans
-Advanced
+Einstellungen
 \family default
- tab, in order to avoid replacing all 
+ zu deaktivieren, um zu verhindern, dass alle 
 \begin_inset Quotes eld
 \end_inset
 
@@ -32455,7 +32453,7 @@ R
 \begin_inset Quotes erd
 \end_inset
 
- letters occurring in normal text), oder occurrences of 
+ im normalen Text ersetzt werden), oder 
 \begin_inset Formula $x_{j}^{i}$
 \end_inset
 
@@ -32463,7 +32461,7 @@ R
 \begin_inset Formula $x_{i,\, j}$
 \end_inset
 
-, oder occurrences of 
+ zu ersetzen oder 
 \begin_inset Formula $x[k]$
 \end_inset
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 9aef884..b70bad0 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -31883,11 +31883,11 @@ Se pueden reemplazar segmentos de texto coincidentes 
en el documento por
 \begin_layout Itemize
 Reemplazar coincidencias de una palabra con una versión personalizada de
  la palabra, por ejemplo, reemplazar "func()"; por su versión en tipo máquina
- de escribir, 
+ de escribir, "
 \family typewriter
-"func()";
+func()
 \family default
-.
+".
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 7f04e52..0c990cc 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -32880,14 +32880,20 @@ fonction()
  par sa version en chasse fixe
 \family typewriter
  
+\family default
+
 \begin_inset Quotes fld
 \end_inset
 
+
+\family typewriter
 fonction()
+\family default
+
 \begin_inset Quotes frd
 \end_inset
 
-;
+
 \end_layout
 
 \begin_layout Itemize

-----------------------------------------------------------------------

Summary of changes:
 lib/doc/UserGuide.lyx    |   45 ++++++++++++++++-----------
 lib/doc/de/UserGuide.lyx |   76 ++++++++++++++++++++++-----------------------
 lib/doc/es/UserGuide.lyx |    6 ++--
 lib/doc/fr/UserGuide.lyx |    8 ++++-
 4 files changed, 73 insertions(+), 62 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to