# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: removemarenhachmannthis@yahoo.com-20170205181516-\
#   wmb0jehg2fqyiukl
# target_branch: bzr+ssh://bazaar.launchpad.net/+branch/inkscape-docs/
# testament_sha1: cf8bc87973f528747288fdfd9806d18854cbf508
# timestamp: 2017-02-05 19:15:31 +0100
# base_revision_id: nicoduf@yahoo.fr-20170205081845-sh4p3s5zyi5j7si4
# 
# Begin patch
=== modified file 'man/pod.de.po'
--- man/pod.de.po	2017-02-05 07:45:29 +0000
+++ man/pod.de.po	2017-02-05 18:15:16 +0000
@@ -2,19 +2,19 @@
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Inkscape package.
 #
-# Maren Hachmann <marenhachmann@yahoo.com>, 2015, 2016.
+# Maren Hachmann <marenhachmann@yahoo.com>, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: inkscape\n"
 "POT-Creation-Date: 2017-02-05 08:42+0100\n"
-"PO-Revision-Date: 2016-06-01 23:52+0200\n"
+"PO-Revision-Date: 2017-02-05 19:13+0100\n"
 "Last-Translator: Maren Hachmann <marenhachmann@yahoo.com>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: =head1
@@ -236,6 +236,9 @@
 "        --no-convert-text-baseline-spacing\n"
 "\n"
 msgstr ""
+"        --vacuum-defs\n"
+"        --no-convert-text-baseline-spacing\n"
+"\n"
 
 #. type: verbatim
 #: inkscape.pod:68
@@ -1050,7 +1053,7 @@
 #. type: =item
 #: inkscape.pod:346
 msgid "B<--no-convert-text-baseline-spacing>"
-msgstr ""
+msgstr "B<--no-convert-text-baseline-spacing>"
 
 #. type: textblock
 #: inkscape.pod:348
@@ -1062,6 +1065,14 @@
 "loading to preserve the intended text layout.  This command line option will "
 "skip that adjustment."
 msgstr ""
+"Text-Grundlinien werden beim Öffnen von älteren (vor Version 0.92) "
+"Dateien nicht repariert. Inkscape 0.92 hat die Definition der Eigenschaft "
+"'line-height' aus dem CSS-Standard übernommen. Diese weicht nun von "
+"der in älteren Versionen genutzten Definition ab. Standardmäßig werden "
+"die Werte für Zeilenhöhe in Dateien, die vor dem Erscheinen von Inkscape "
+"0.92 erstellt worden sind, beim Laden angepasst, um das Erscheinungsbild "
+"des Textes zu erhalten. Der Kommandozeilenbefehl bewirkt, dass die "
+"Anpassung nicht vorgenommen wird."
 
 #. type: =item
 #: inkscape.pod:355
@@ -1298,10 +1309,12 @@
 #: inkscape.pod:427
 #, no-wrap
 msgid ""
-"    inkscape filename.svg --export-id=text1555 --export-png=text.png --export-area-snap\n"
+"    inkscape filename.svg --export-id=text1555 --export-png=text.png"
+" --export-area-snap\n"
 "\n"
 msgstr ""
-"    inkscape dateiname.svg --export-id=text1555 --export-png=text.png --export-area-snap\n"
+"    inkscape dateiname.svg --export-id=text1555 --export-png=text.png"
+" --export-area-snap\n"
 "\n"
 
 #. type: textblock
@@ -1364,10 +1377,12 @@
 #: inkscape.pod:443
 #, no-wrap
 msgid ""
-"    inkscape filename.svg --select=path1555 --verb=EditDuplicate --verb=ObjectRotate90 --verb=FileSave --verb=FileClose\n"
+"    inkscape filename.svg --select=path1555 --verb=EditDuplicate"
+" --verb=ObjectRotate90 --verb=FileSave --verb=FileClose\n"
 "\n"
 msgstr ""
-"    inkscape dateiname.svg --select=path1555 --verb=EditDuplicate --verb=ObjectRotate90 --verb=FileSave --verb=FileClose\n"
+"    inkscape dateiname.svg --select=path1555 --verb=EditDuplicate"
+" --verb=ObjectRotate90 --verb=FileSave --verb=FileClose\n"
 "\n"
 
 #. type: =head1
@@ -1764,19 +1779,17 @@
 
 #. type: textblock
 #: inkscape.pod:595
-#, fuzzy
 msgid "B<Copyright (C)> 1999-2016 by Authors."
-msgstr "B<Copyright (C)> 1999-2015 liegt bei den Autoren."
+msgstr "B<Copyright (C)> 1999-2017 liegt bei den Autoren."
 
 #. type: textblock
 #: inkscape.pod:597
-#, fuzzy
 msgid ""
 "B<Inkscape> is free software; you can redistribute it and/or modify it under "
 "the terms of the GPL version 2 or later."
 msgstr ""
-"B<Inkscape> ist freie Software. Sie dürfen es zu den Bedingungen der GPL "
-"weiterverbreiten und / oder verändern."
+"B<Inkscape> ist freie Software. Sie dürfen es zu den Bedingungen der GPL in "
+"Version 2 oder höher weiterverbreiten und / oder verändern."
 
 #. type: =for
 #: inkscape.pod:601

# Begin bundle
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
ux9A