From 919e2596fcc53a06c59ac2919ebcd39ae4f436f5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Tue, 19 Jul 2011 13:19:05 +0000
Subject: [PATCH] - UserGuide.lyx, EmbeddedObjects.lyx: some tweaks - German
 UserGuide.lyx: some translations

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39346 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/EmbeddedObjects.lyx    |   4 +-
 lib/doc/UserGuide.lyx          |  22 +++----
 lib/doc/de/EmbeddedObjects.lyx |   2 +-
 lib/doc/de/UserGuide.lyx       | 111 +++++++++++----------------------
 lib/doc/es/EmbeddedObjects.lyx |   4 +-
 lib/doc/es/UserGuide.lyx       |  19 +++---
 lib/doc/fr/EmbeddedObjects.lyx |  75 +---------------------
 lib/doc/fr/UserGuide.lyx       |  19 +++---
 lib/doc/ja/EmbeddedObjects.lyx |   8 +++
 lib/doc/ja/UserGuide.lyx       |  19 +++---
 10 files changed, 94 insertions(+), 189 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index bd0e72baea..eed128146c 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -311,9 +311,9 @@ colortbl
 \series default
 , 
 \series bold
-marginnote
+lettrine, marginnote, picinpar
 \series default
-, and 
+ and 
 \series bold
 sidecap
 \series default
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 4b15473dc7..d3348c5523 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -6704,11 +6704,11 @@ Note:
 \end_layout
 
 \begin_layout Standard
-In some cases you might want to resume the list with a different number
- than the next one.
- Or you want to start a new enumeration, but with a different number.
- This is also possible by adding an optional argument to the first list
- item.
+Perhaps you might want to resume the list with a different number than the
+ next one.
+ Or you want to start a new enumeration with a defined number.
+ This is possible by adding an optional argument to the first list item
+ of a normal new enumeration.
  There insert the command
 \end_layout
 
@@ -6779,7 +6779,7 @@ Lists ! Spacing
 \begin_layout Standard
 In some cases you might want less or more vertical space between the items
  of a list.
- For example the default space is too much in your opinion:
+ For example the default space is too much in your opinion in this case:
 \end_layout
 
 \begin_layout Itemize
@@ -6797,7 +6797,7 @@ You can decrease the space by adding an optional argument to the first item
 \series bold
 nolistsep
 \series default
- to get no space like in this example:
+ to get no additional list space like in this example:
 \end_layout
 
 \begin_layout Itemize
@@ -6824,7 +6824,7 @@ A bullet list
 \end_layout
 
 \begin_layout Itemize
-with no additional
+without additional
 \end_layout
 
 \begin_layout Itemize
@@ -6861,12 +6861,12 @@ key "enumitem"
 \begin_layout Standard
 There are also many commands available to change the horizontal spacing
  and indentation.
- Here is an example where the indentation was changed to the negative one
- of the paragraphs in the document and the label separation was set to 2
+ Here is an example where the indentation was changed to the one of the
+ paragraphs in the document and the label separation was set to 2
 \begin_inset space \thinspace{}
 \end_inset
 
-cm.
+cm so that the number is in the page margin:
 \end_layout
 
 \begin_layout Enumerate
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index a3e2295f21..38498fdce8 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -329,7 +329,7 @@ colortbl
 \series default
 , 
 \series bold
-marginnote
+lettrine, marginnote, picinpar
 \series default
  und 
 \series bold
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 6a749ccf2f..40374d4c05 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8622,24 +8622,12 @@ Achtung:
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-In some cases you might want to resume the list with a different number
- than the next one.
- Or you want to start a new 
-\lang ngerman
-Aufzählung
-\lang english
-, but with a different 
-\lang ngerman
-Nummer
-\lang english
-.
- This is also possible by adding an optional argument to the first list
- item.
- There insert the 
-\lang ngerman
-Befehl
+Vielleicht wollen Sie die Liste mit einer anderen Nummer als die eigentlich
+ folgende fortsetzen.
+ Oder Sie wollen eine neue Aufzählung starten, die mit einer bestimmten
+ Nummer beginnen soll.
+ Dies ist möglich, indem Sie in einer neuen, normalen Liste ein optionales
+ Argument im ersten Listeneintrag einfügen und darin den Befehl
 \end_layout
 
 \begin_layout Standard
@@ -8649,11 +8637,12 @@ start=Nummer
 \end_layout
 
 \begin_layout Standard
-wobei 
+verwenden.
+ Dabei ist 
 \emph on
 Nummer
 \emph default
- die Nummer ist, mit der Sie die Liste fortsetzen wollen.
+ die Nummer, mit der Sie die Liste fortsetzen wollen.
  Ein Beispiel:
 \end_layout
 
@@ -8707,43 +8696,36 @@ Liste ! Abstände
 \end_layout
 
 \begin_layout Standard
+In manchen Fällen wollen Sie vielleicht weniger vertikalen Abstand zwischen
+ den Listeneinträgen haben.
+ Z.
+\begin_inset space \thinspace{}
+\end_inset
 
-\lang english
-In some cases you might want less or more vertical space between the items
- of a list.
- For example the default space is too much in your opinion:
+B.
+\begin_inset space ~
+\end_inset
+
+ ist ihrer Meinung nach zu viel Abstand in dieser Liste:
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-A bullet list
+Eine Auf\SpecialChar \textcompwordmark{}
+listung
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-with standard spacing 
+mit Standard-Abstand
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-You can decrease the space by adding an optional argument to the first item
- of the list.
- There add the
-\lang ngerman
- Befehl 
+Der Abstand kann verkleinert werden, indem man ein optionales Argument im
+ ersten Listeneintrag verwendet.
+ Darin fügt man den Befehl 
 \series bold
 nolistsep
 \series default
- 
-\lang english
-to get no space like in this
-\lang ngerman
- Beispiel
-\lang english
-:
+ ein, der den zusätzlichen Listenabstand entfernt, wie in diesem Beispiel:
 \end_layout
 
 \begin_layout Itemize
@@ -8766,25 +8748,20 @@ nolistsep
 
 \end_inset
 
-
-\lang english
-A bullet list
+Eine Auf\SpecialChar \textcompwordmark{}
+listung
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-with no additional
+ohne zusätzlichen
 \end_layout
 
 \begin_layout Itemize
-
-\lang english
-vertical space
+vertikalen Abstand
 \end_layout
 
 \begin_layout Standard
-Im Abstand hinzuzufügen können Sie verschiedene andere Befehle des LaTeX-Pakets
+Um Abstand hinzuzufügen, können Sie verschiedene andere Befehle des LaTeX-Pakets
  
 \series bold
 enumitem
@@ -8811,25 +8788,14 @@ key "enumitem"
 \end_layout
 
 \begin_layout Standard
-
-\lang english
-There are also many 
-\lang ngerman
-Befehle
-\lang english
- available to change the horizontal spacing and indentation.
- Here is an 
-\lang ngerman
-Beispiel
-\lang english
- where the indentation was changed to the negative one of the paragraphs
- in the document and the label separation was set to
-\lang ngerman
- 2
+Es gibt zudem viele Befehle mit denen horizontale Abstände und der Einzug
+ eingestellt werden kann.
+ Hier ist ein Beispiel bei dem der Einzug auf den Einzug der Absätze des
+ Dokuments gesetzt wurde und der Abstand zwischen Nummer und Text auf 2
 \begin_inset space \thinspace{}
 \end_inset
 
-cm.
+cm, so dass sich die Nummer im Seitenrand befindet:
 \end_layout
 
 \begin_layout Enumerate
@@ -8858,9 +8824,7 @@ Eine Aufzählung
 \end_layout
 
 \begin_layout Enumerate
-
-\lang english
-with negative indentation
+mit negativem Einzug
 \end_layout
 
 \begin_layout Subsubsection
@@ -46041,6 +46005,7 @@ LaTeX-Paket ! enumitem
 status collapsed
 
 \begin_layout Plain Layout
+
 http://mirrors.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
 \end_layout
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 42f5c7601b..ff411089a8 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -315,7 +315,7 @@ LatexCommand tableofcontents
 
 \begin_layout Standard
 \begin_inset Note Note
-status collapsed
+status open
 
 \begin_layout Plain Layout
 Para exportar todas las partes de este documento a PDF, PS, o DVI, deben
@@ -329,7 +329,7 @@ colortbl
 \series default
 , 
 \series bold
-marginnote
+lettrine, marginnote, picinpar
 \series default
  y 
 \series bold
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 518a4b66cf..c6246f7eb5 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -6955,11 +6955,11 @@ Note:
 \begin_layout Standard
 
 \lang english
-In some cases you might want to resume the list with a different number
- than the next one.
- Or you want to start a new enumeration, but with a different number.
+Perhaps you might want to resume the list with a different number than the
+ next one.
+ Or you want to start a new enumeration with a defined number.
  This is also possible by adding an optional argument to the first list
- item.
+ item of a normal new enumeration.
  There insert the command
 \end_layout
 
@@ -7046,7 +7046,7 @@ Lists ! Spacing
 \lang english
 In some cases you might want less or more vertical space between the items
  of a list.
- For example the default space is too much in your opinion:
+ For example the default space is too much in your opinion in this case:
 \end_layout
 
 \begin_layout Itemize
@@ -7070,7 +7070,7 @@ You can decrease the space by adding an optional argument to the first item
 \series bold
 nolistsep
 \series default
- to get no space like in this example:
+ to get no additional list space like in this example:
 \end_layout
 
 \begin_layout Itemize
@@ -7149,12 +7149,12 @@ key "enumitem"
 \lang english
 There are also many commands available to change the horizontal spacing
  and indentation.
- Here is an example where the indentation was changed to the negative one
- of the paragraphs in the document and the label separation was set to 2
+ Here is an example where the indentation was changed to the one of the
+ paragraphs in the document and the label separation was set to 2
 \begin_inset space \thinspace{}
 \end_inset
 
-cm.
+cm so that the number is in the page margin:
 \end_layout
 
 \begin_layout Enumerate
@@ -48663,6 +48663,7 @@ LaTeX, paquetes ! enumitem
 status collapsed
 
 \begin_layout Plain Layout
+
 http://mirrors.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
 \end_layout
 
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 375babf91e..0469311114 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -309,78 +309,7 @@ LatexCommand tableofcontents
 
 \begin_layout Standard
 \begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-Si votre distribution LaTeX est un peu ancienne (TeXLive 2007 par exemple),
- 
-\begin_inset Quotes fld
-\end_inset
-
-Visionner
-\begin_inset Quotes frd
-\end_inset
-
- ou 
-\begin_inset Quotes fld
-\end_inset
-
-Exporter
-\begin_inset Quotes frd
-\end_inset
-
- en PDF ne fonctionnera pas du fait d'un conflit entre 
-\family typewriter
-varioref/hyperref
-\family default
- et le caractère 
-\begin_inset Quotes fld
-\end_inset
-
-:
-\begin_inset Quotes frd
-\end_inset
-
- apparaissant dans certaines étiquettes.
- Pour résoudre ce problème, vous pouvez:
-\end_layout
-
-\begin_layout Itemize
-soit désactiver 
-\family typewriter
-hyperref
-\family default
- dans le menu 
-\family sans
-Document\SpecialChar \menuseparator
-Paramètres\SpecialChar \menuseparator
-Propriété PDF
-\family default
-;
-\end_layout
-
-\begin_layout Itemize
-Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
-\begin_inset Newline newline
-\end_inset
-
-
-\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#UserGuide
-\series default
-;
-\end_layout
-
-\begin_layout Itemize
-soit mettre à jour votre distribution (en installant par exemple au moins
- TeXLive 2008)
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
+status open
 
 \begin_layout Plain Layout
 Pour pouvoir exporter ce document en PDF, PS ou DVI, les paquetages LaTeX
@@ -394,7 +323,7 @@ colortbl
 \series default
 , 
 \series bold
-marginnote
+lettrine, marginnote, picinpar
 \series default
 , et 
 \series bold
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 857e08f870..b85ca1b70d 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -6888,11 +6888,11 @@ Note:
 \begin_layout Standard
 
 \lang english
-In some cases you might want to resume the list with a different number
- than the next one.
- Or you want to start a new enumeration, but with a different number.
+Perhaps you might want to resume the list with a different number than the
+ next one.
+ Or you want to start a new enumeration with a defined number.
  This is also possible by adding an optional argument to the first list
- item.
+ item of a normal new enumeration.
  There insert the command
 \end_layout
 
@@ -6979,7 +6979,7 @@ Lists ! Spacing
 \lang english
 In some cases you might want less or more vertical space between the items
  of a list.
- For example the default space is too much in your opinion:
+ For example the default space is too much in your opinion in this case:
 \end_layout
 
 \begin_layout Itemize
@@ -7003,7 +7003,7 @@ You can decrease the space by adding an optional argument to the first item
 \series bold
 nolistsep
 \series default
- to get no space like in this example:
+ to get no additional list space like in this example:
 \end_layout
 
 \begin_layout Itemize
@@ -7082,12 +7082,12 @@ key "enumitem"
 \lang english
 There are also many commands available to change the horizontal spacing
  and indentation.
- Here is an example where the indentation was changed to the negative one
- of the paragraphs in the document and the label separation was set to 2
+ Here is an example where the indentation was changed to the one of the
+ paragraphs in the document and the label separation was set to 2
 \begin_inset space \thinspace{}
 \end_inset
 
-cm.
+cm so that the number is in the page margin:
 \end_layout
 
 \begin_layout Enumerate
@@ -47460,6 +47460,7 @@ Paquetages LaTeX ! enumitem
 status collapsed
 
 \begin_layout Plain Layout
+
 http://mirrors.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
 \end_layout
 
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 5c9f9134b5..0cc6ad148a 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -326,10 +326,18 @@ colortbl
 \series default
 ・
 \series bold
+lettrine
+\series default
+・
+\series bold
 marginnote
 \series default
 ・
 \series bold
+picinpar
+\series default
+・
+\series bold
 sidecap
 \series default
 の各LaTeXパッケージが導入されている必要があります。これらが導入されていなくても、文書を書き出すことはできますが、これらのパッケージが必要な節は出力には表示
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 856e3b50a0..50818b4cc2 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -10326,11 +10326,11 @@ Note:
 \begin_layout Standard
 
 \lang english
-In some cases you might want to resume the list with a different number
- than the next one.
- Or you want to start a new enumeration, but with a different number.
+Perhaps you might want to resume the list with a different number than the
+ next one.
+ Or you want to start a new enumeration with a defined number.
  This is also possible by adding an optional argument to the first list
- item.
+ item of a normal new enumeration.
  There insert the command
 \end_layout
 
@@ -10417,7 +10417,7 @@ Lists ! Spacing
 \lang english
 In some cases you might want less or more vertical space between the items
  of a list.
- For example the default space is too much in your opinion:
+ For example the default space is too much in your opinion in this case:
 \end_layout
 
 \begin_layout Itemize
@@ -10441,7 +10441,7 @@ You can decrease the space by adding an optional argument to the first item
 \series bold
 nolistsep
 \series default
- to get no space like in this example:
+ to get no additional list space like in this example:
 \end_layout
 
 \begin_layout Itemize
@@ -10520,12 +10520,12 @@ key "enumitem"
 \lang english
 There are also many commands available to change the horizontal spacing
  and indentation.
- Here is an example where the indentation was changed to the negative one
- of the paragraphs in the document and the label separation was set to 2
+ Here is an example where the indentation was changed to the one of the
+ paragraphs in the document and the label separation was set to 2
 \begin_inset space \thinspace{}
 \end_inset
 
-cm.
+cm so that the number is in the page margin:
 \end_layout
 
 \begin_layout Enumerate
@@ -51432,6 +51432,7 @@ target "http://mirrors.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf"
 status collapsed
 
 \begin_layout Plain Layout
+
 http://mirrors.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
 \end_layout
 
-- 
2.39.5