Merge branch 'master' of git.lyx.org:lyx

Conflicts:
	po/de.po

Signed-off-by: Jürgen Spitzmüller <jspitzm@linux-np7j.(none)>

diff --cc po/de.po
index ad0c7efa3f9b01ec0bee95920cb49e071d3443b8,0fdd851da7bc4f7f0b9e157f16ae3da999b0e086..b4a5ce81836ddab4dd39bb5b805a5b7014f6c569
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -6438,19 -6957,21 +6961,21 @@@ msgstr "Schema
  
  #: lib/layouts/achemso.layout:127
  msgid "List of Schemes"
 -msgstr "Liste der Schemata"
 +msgstr "Verzeichnis der Schemata"
  
- #: lib/layouts/achemso.layout:144 lib/layouts/achemso.layout:155
+ #: lib/layouts/achemso.layout:144
+ #: lib/layouts/achemso.layout:155
  msgid "Chart"
 -msgstr "Zeichnung"
 +msgstr "Diagramm"
  
  #: lib/layouts/achemso.layout:149
  msgid "List of Charts"
 -msgstr "Liste der Zeichnungen"
 +msgstr "Diagrammverzeichnis"
  
- #: lib/layouts/achemso.layout:166 lib/layouts/achemso.layout:177
+ #: lib/layouts/achemso.layout:166
+ #: lib/layouts/achemso.layout:177
  msgid "Graph"
 -msgstr "Graph"
 +msgstr "Schaubild"
  
  #: lib/layouts/achemso.layout:171
  msgid "List of Graphs"
@@@ -10401,9 -11398,10 +11402,10 @@@ msgstr "Petit
  
  #: lib/layouts/svcommon.inc:607
  msgid "Svgraybox"
 -msgstr "Svgraybox"
 +msgstr "SV-Graubox"
  
- #: lib/layouts/theorems-ams-bytype.inc:166 lib/layouts/theorems-bytype.inc:142
+ #: lib/layouts/theorems-ams-bytype.inc:166
+ #: lib/layouts/theorems-bytype.inc:142
  #: lib/layouts/theorems-without-preamble.inc:163
  msgid "Fact \\thefact."
  msgstr "Fakt \\thefact."
@@@ -23520,19 -24284,19 +24300,19 @@@ msgstr "Zweige
  
  #: src/frontends/qt4/qt_helpers.cpp:576
  msgid "List of Changes"
 -msgstr "Liste der Änderungen"
 +msgstr "Änderungen"
  
- #: src/insets/ExternalSupport.cpp:369 src/insets/InsetBibtex.cpp:299
- #: src/insets/InsetGraphics.cpp:597 src/insets/InsetInclude.cpp:541
- msgid ""
- "The following filename will cause troubles when running the exported file "
- "through LaTeX: "
- msgstr ""
- "Der folgende Dateiname wird Probleme bereiten, wenn LaTeX mit der "
- "exportierten Datei ausgeführt wird: "
- 
- #: src/insets/ExternalSupport.cpp:374 src/insets/InsetBibtex.cpp:304
- #: src/insets/InsetGraphics.cpp:604 src/insets/InsetInclude.cpp:546
+ #: src/insets/ExternalSupport.cpp:369
+ #: src/insets/InsetBibtex.cpp:299
+ #: src/insets/InsetGraphics.cpp:597
+ #: src/insets/InsetInclude.cpp:541
+ msgid "The following filename will cause troubles when running the exported file through LaTeX: "
+ msgstr "Der folgende Dateiname wird Probleme bereiten, wenn LaTeX mit der exportierten Datei ausgeführt wird: "
+ 
+ #: src/insets/ExternalSupport.cpp:374
+ #: src/insets/InsetBibtex.cpp:304
+ #: src/insets/InsetGraphics.cpp:604
+ #: src/insets/InsetInclude.cpp:546
  msgid "Problematic filename for DVI"
  msgstr "Problematischer Dateiname für DVI"