The following commit has been merged in the master branch:
commit b0b59cccd2bc8ac1e0d8d157d32fd55f5cd1d04b
Author: Helge Kreutzmann <[email protected]>
Date: Tue Apr 20 22:30:05 2010 +0200
Update German translation of manual pages
Update to 1907t0f8u.
diff --git a/man/po/de.po b/man/po/de.po
index 3d0b7f6..379eaad 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
"POT-Creation-Date: 2010-03-07 21:33+0000\n"
-"PO-Revision-Date: 2010-04-18 10:42+0200\n"
+"PO-Revision-Date: 2010-04-20 22:29+0200\n"
"Last-Translator: Helge Kreutzmann <[email protected]>\n"
"Language-Team: de <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -31,8 +31,8 @@ msgstr "2009-02-27"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
dpkg-genchanges.1:1
#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
@@ -53,8 +53,8 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
dpkg-genchanges.1:2
#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
@@ -73,14 +73,13 @@ msgstr "deb - Debian-Bin
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5 "
-#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
dpkg-gensymbols.1:6 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5
-#: update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "�BERSICHT"
@@ -100,8 +99,8 @@ msgstr "I<Dateiname>B<.deb>"
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 maintscript-helper.1:15
-#: start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
@@ -1242,13 +1241,14 @@ msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright \\(co 2007 Frank Lichtenheld"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:329 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
dpkg-deb.1:256
#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
#: dpkg-statoverride.8:86 dpkg-vendor.1:53
-#: maintscript-helper.1:117 update-alternatives.8:494
+#: maintscript-helper.1:117
+#: update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
"for copying conditions. There is NO WARRANTY."
@@ -1944,8 +1944,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114
dpkg-split.1:212
#: dpkg-statoverride.8:69 dselect.cfg.5:12
#: update-alternatives.8:355
#, no-wrap
@@ -1992,6 +1992,7 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -2001,7 +2002,7 @@ msgstr "AUTOR"
#. type: Plain text
#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:584
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright \\(co 1995-1996 Ian Jackson"
@@ -2316,6 +2317,7 @@ msgstr "2010-03-07"
#. type: TH
#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1 dpkg-query.1:1
dpkg-trigger.1:1
#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "dpkg-Programmsammlung"
@@ -3060,8 +3062,8 @@ msgstr ""
"im gleichen Lauf ausgef�hrt werden, zur�ckgesetzt."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
dpkg-vendor.1:28 dselect.1:121
#: update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
@@ -3095,8 +3097,8 @@ msgid "Give help about debugging options."
msgstr "Gib Hilfe �ber Debugging-Optionen."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
dpkg-deb.1:166
#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
@@ -3209,7 +3211,7 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
dpkg-parsechangelog.1:15
#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
@@ -4039,8 +4041,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr "UMGEBUNG"
@@ -4464,8 +4466,8 @@ msgstr ""
"wird, falls Ihre Wahl nicht mit dem Standardwert �bereinstimmt."
#. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
dpkg-trigger.1:24
#: dpkg-vendor.1:14 start-stop-daemon.8:35
#: update-alternatives.8:203
#, no-wrap
@@ -4591,9 +4593,10 @@ msgid "Print a list of valid architecture names."
msgstr "Zeige eine Liste von g�ltigen Architekturnamen."
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
dpkg-divert.8:74 dpkg-genchanges.1:134
#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
#: dpkg-split.1:130
@@ -4603,9 +4606,10 @@ msgid "Show the usage message and exit."
msgstr "Zeige den Bedienungshinweis und beende."
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
dpkg-divert.8:77 dpkg-genchanges.1:137
#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
#: dpkg-split.1:133
@@ -9303,6 +9307,142 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "dpkg-mergechangelogs"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, no-wrap
+msgid "2010-04-18"
+msgstr "2010-04-18"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr ""
+"dpkg-mergechangelogs - 3-Wege-Zusammenf�hrung von debian/changelog-Dateien"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr ""
+"B<dpkg-mergechangelogs> [I<Option>...] I<alt> I<neu-a> I<neu-b> [I<Ausgabe>]"
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+# type: TP
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr "B<--merge-prereleases>, B<-m>"
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, no-wrap
+msgid "LIMITATIONS"
+msgstr "EINSCHR�NKUNGEN"
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+# type: SH
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr "INTEGRATION MIT GIT"
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr " debian/changelog merge=dpkg-mergechangelogs\n"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -15415,8 +15555,8 @@ msgid ""
msgstr ""
"Aktuelle Implementierung: im B<preinst> wird gepr�ft, ob die Conffile "
"ge�ndert wurde. Dann wird sie entweder in I<Conffile>B<.dpkg-remove> (falls "
-"sie nicht ge�ndert wurde) oder in I<Conffile>B<.dpkg-bak> (falls sie ge�ndert
"
-"wurde) umbenannt. Letztere wird als Referenz behalten, da sie "
+"sie nicht ge�ndert wurde) oder in I<Conffile>B<.dpkg-bak> (falls sie "
+"ge�ndert wurde) umbenannt. Letztere wird als Referenz behalten, da sie "
"Benutzer�nderungen ent�hlt, w�hrend erstere im B<postinst> entfernt wird. "
"Falls das Upgrade des Pakets abgebrochen wird, reinstalliert B<postrm> die "
"urspr�ngliche Conffile. W�hrend des vollst�ndigen L�schens wird B<postrm> "
@@ -15443,8 +15583,8 @@ msgstr ""
"Sie sicherstellen, dass Sie auch alle �nderungen des Benutzers mit "
"�bernehmen. Anf�nglich erscheint dies als einfache �nderung am Skript "
"B<preinst>, allerdings wird dies dazu f�hren, dass der Benutzer von Dpkg "
-"aufgefordert wird, die Bearbeitung der Conffile zu best�tigen, obwohl sie f�r
"
-"diese gar nicht verantwortlich sind."
+"aufgefordert wird, die Bearbeitung der Conffile zu best�tigen, obwohl sie "
+"f�r diese gar nicht verantwortlich sind."
# type: Plain text
#. type: Plain text
@@ -15484,9 +15624,9 @@ msgid ""
msgstr ""
"I<alteConffile> und I<neueConffile> sind der alte und der neue Name der "
"umzubenennenden Conffile. I<letzeVersion> ist die letzte Version des Pakets, "
-"die die Conffile mit dem alten Namen enthielt. I<Paket> ist der Paketname. Er
"
-"ist optional, da er standardm��ig mit $DPKG_MAINTSCRIPT_PACKAGE belegt ist "
-"(diese Variable wird von Dpkg auf den Namen des momentan in Bearbeitung "
+"die die Conffile mit dem alten Namen enthielt. I<Paket> ist der Paketname. "
+"Er ist optional, da er standardm��ig mit $DPKG_MAINTSCRIPT_PACKAGE belegt "
+"ist (diese Variable wird von Dpkg auf den Namen des momentan in Bearbeitung "
"befindlichen Pakets gesetzt). Alle Parameter des Betreuerskripts m�ssen nach "
"�--� an das Programm weitergeleitet werden."
@@ -15502,12 +15642,12 @@ msgid ""
"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
"required."
msgstr ""
-"Aktuelle Implementierung: das B<preinst> �berpr�ft, ob die Conffile ver�ndert
"
-"wurde, falls ja, verbleibt sie am Platz, andernfalls wird sie in "
+"Aktuelle Implementierung: das B<preinst> �berpr�ft, ob die Conffile "
+"ver�ndert wurde, falls ja, verbleibt sie am Platz, andernfalls wird sie in "
"I<alteConffile>B<.dpkg-remove> umbenannt. Bei der Konfiguration entfernt das "
"B<postinst> I<alteConffile>B<.dpkg-remove> und bennent I<alteConffile> in "
-"I<neueConffile> um, falls I<alteConffile> noch existiert. Falls
abort-upgrade/"
-"abort-install eintritt, benennt das B<postrm> wieder "
+"I<neueConffile> um, falls I<alteConffile> noch existiert. Falls abort-"
+"upgrade/abort-install eintritt, benennt das B<postrm> wieder "
"I<alteConffile>B<.dpkg-remove> in I<alteConffile> zur�ck, falls notwendig."
#. type: Plain text
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
