From dfd0e4dc80ad2b6b8c3a1870f9fd0f2eea5b47fc Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 21 Jul 2007 16:30:16 +0000
Subject: [PATCH] Regenerate man/po/dpkg-man.pot and merge it into man/po/*.po.

---
 man/ChangeLog       |    5 +
 man/po/de.po        | 1396 ++++++++++++++++++++++-------------------
 man/po/dpkg-man.pot |  912 +++++++++++++--------------
 man/po/es.po        | 1351 ++++++++++++++++++++++------------------
 man/po/fr.po        | 1441 ++++++++++++++++++++++++-------------------
 man/po/hu.po        | 1179 +++++++++++++++++------------------
 man/po/ja.po        | 1297 ++++++++++++++++++++------------------
 man/po/pl.po        | 1320 +++++++++++++++++++++------------------
 man/po/pt_BR.po     | 1207 +++++++++++++++++++-----------------
 man/po/ru.po        | 1215 +++++++++++++++++++-----------------
 man/po/sv.po        | 1253 +++++++++++++++++++------------------
 11 files changed, 6667 insertions(+), 5909 deletions(-)

diff --git a/man/ChangeLog b/man/ChangeLog
index 483e9f8e..698464a3 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-21  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
 2007-07-18  Guillem Jover  <guillem@debian.org>
 
 	* cleanup-info.8: Unify author and copyright information formatting.
diff --git a/man/po/de.po b/man/po/de.po
index 838f954b..821bdd7a 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2007-07-08 13:01+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr ""
 "gleiche Funktionalität bietet, wenn es mit B<-R> aufgerufen wird."
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -173,9 +173,9 @@ msgstr "B<822-date> nimmt keine Argumente oder Optionen an."
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -191,15 +191,16 @@ msgstr "Diese Anlage sollte wirklich ein Teil von B<date>(1) sein."
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -214,9 +215,10 @@ msgstr "I<Internet Message Format> (RFC2822), B<date>(1)."
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
@@ -244,12 +246,16 @@ msgid "cleanup-info"
 msgstr "cleanup-info"
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
-#, no-wrap
-msgid "2007-03-06"
-msgstr "2007-03-06"
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-07-18"
+msgstr "2007-05-15"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -325,19 +331,20 @@ msgstr ""
 "verstümmeln!>"
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -348,25 +355,25 @@ msgid "Show the usage message and exit."
 msgstr "Zeige den Bedienungshinweis und beende."
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -377,13 +384,12 @@ msgstr "Gebe die Version aus und beende sich."
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
@@ -415,16 +421,23 @@ msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+#, fuzzy
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Dies ist Freie Software; lesen Sie die GNU General Public License Version 2 "
 "oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
@@ -1322,19 +1335,6 @@ msgstr "B<dpkg-shlibdeps>(1)."
 msgid "deb-substvars"
 msgstr "deb-substvars"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, no-wrap
-msgid "2007-06-12"
-msgstr "2007-06-12"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1396,9 +1396,9 @@ msgid ""
 msgstr ""
 "Variablen können über die allgemeine B<-V>-Option gesetzt werden. Sie können "
 "auch in der B<debian/substvars> (bzw. in der über die Option B<-T> gesetzten "
-"Datei) angegeben werden. Diese Datei besteht auch Zeilen der Form I<Name>B<=>"
-"I<Wert>. Leerzeichen am Zeilenende, leere Zeilen und Zeilen, die mit dem B<#>-"
-"Symbol starten (Kommentare) werden ignoriert."
+"Datei) angegeben werden. Diese Datei besteht auch Zeilen der Form "
+"I<Name>B<=>I<Wert>. Leerzeichen am Zeilenende, leere Zeilen und Zeilen, die "
+"mit dem B<#>-Symbol starten (Kommentare) werden ignoriert."
 
 # type: Plain text
 #: ../../man/deb-substvars.5:48
@@ -1528,8 +1528,8 @@ msgid ""
 "on places where they are expanded explicitly."
 msgstr ""
 "Der Wert des Ausgabefeldes I<Feldname> (der in der kanonischen Groß-/"
-"Kleinschreibung angegeben werden muss). Das Setzten dieser Variablen hat "
-"nur einen Effekt an den Stellen, wo diese explizit expandiert werden."
+"Kleinschreibung angegeben werden muss). Das Setzten dieser Variablen hat nur "
+"einen Effekt an den Stellen, wo diese explizit expandiert werden."
 
 # type: TP
 #: ../../man/deb-substvars.5:93
@@ -1618,7 +1618,7 @@ msgid "List of substitution variables and values."
 msgstr "Liste von Substitutionsvariablen und -werte."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1636,47 +1636,23 @@ msgstr ""
 "(1), B<dpkg-source>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-"Diese Hilfsprogramme und diese Handbuchseite wurden von Ian Jackson "
-"geschrieben."
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright (C) 2000 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Dies ist Freie Software; lesen Sie die GNU General Public License Version 2 "
-"oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1976,8 +1952,8 @@ msgstr "AKTIONEN"
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<Paketdatei>..."
 
 # type: Plain text
@@ -2050,8 +2026,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<Paketdatei> ..."
 
 # type: Plain text
@@ -2066,8 +2042,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<Paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2104,8 +2080,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<Paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2151,8 +2127,8 @@ msgstr "B<3.> F
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-Datei>"
 
 # type: Plain text
@@ -2184,8 +2160,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<Paketdatei> ..."
 
 # type: Plain text
@@ -2202,8 +2178,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2214,8 +2190,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2226,9 +2202,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>, B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2242,8 +2218,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<Paket-Name-Muster>...]"
 
 # type: Plain text
@@ -2257,8 +2233,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2276,8 +2252,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
@@ -2294,8 +2270,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2309,8 +2285,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2323,8 +2299,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<Ver1 Op Ver2>"
 
 # type: Plain text
@@ -2351,14 +2327,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2367,12 +2344,6 @@ msgstr ""
 "Datei-Deskriptor gesetzte Optionen werden nicht für nachfolgende Befehle, "
 "die im gleichen Lauf ausgeführt werden, zurückgesetzt."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2380,8 +2351,8 @@ msgstr "Zeige eine kurze Hilfenachricht an."
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2391,9 +2362,9 @@ msgstr "Gebe Hilfe 
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<-D>, B<--debug>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2402,21 +2373,15 @@ msgstr "Gib Hilfe 
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr "Zeige die B<dpkg>-Lizenz an."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2437,26 +2402,26 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<Verzeichnis> [I<Dateiname>]\n"
 "    Baue ein deb-Paket.\n"
@@ -2489,19 +2454,20 @@ msgstr ""
 "Aktionen."
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<Paketnamen-Muster> ...\n"
 "    Liste auf das übergebene Suchmuster passende Pakete auf.\n"
@@ -2515,7 +2481,7 @@ msgstr ""
 "    Zeige Details über I<Paket>, wie in I</var/lib/dpkg/available> gefunden.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2529,26 +2495,26 @@ msgstr ""
 "(falls es mit B<#> beginnt)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<Zahl>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Ändere nach wie vielen Fehlern B<dpkg> abbrechen wird. Der Standardwert ist "
 "50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2561,13 +2527,13 @@ msgstr ""
 "entfernten Paket abhängt."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<Oktal>B< | --debug=>I<Oktal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2579,7 +2545,7 @@ msgstr ""
 "oder B<--debug=help> zeigen diese Debugging-Werte an."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2607,13 +2573,13 @@ msgstr ""
 " 2000   Verrückte Mengen an Gelaber\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<Sachen> | B<--no-force->I<Sachen> | B<--refuse->I<Sachen>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2626,7 +2592,7 @@ msgstr ""
 "diese beschreibt. Mit (*) markierte Dinge werden standardmäßig erzwungen."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2637,12 +2603,12 @@ msgstr ""
 "gesamtes System zerstören.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Schaltet alle »force«-Optionen ein (oder aus)."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2651,7 +2617,7 @@ msgstr ""
 "davon bereits installiert ist."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2668,7 +2634,7 @@ msgstr ""
 "Vorsicht.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2677,12 +2643,12 @@ msgstr ""
 "Paket von dem das aktuelle Paket abhängt."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Verarbeite auch Pakete, die mit »halten« markiert sind."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2693,7 +2659,7 @@ msgstr ""
 "Teile des Pakets auf dem System bleiben und von B<dpkg> vergessen werden."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2706,19 +2672,19 @@ msgstr ""
 "Vorsicht."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2728,7 +2694,7 @@ msgstr ""
 "einige Dateien überschrieben werden."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2738,7 +2704,7 @@ msgstr ""
 "nicht erhalten wird."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2749,7 +2715,7 @@ msgstr ""
 "angegeben, in welchem Falle die Standardaktion bevorzugt wird."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2760,7 +2726,7 @@ msgstr ""
 "angegeben, in welchem Falle die Standardaktion bevorzugt wird."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2774,21 +2740,21 @@ msgstr ""
 "Aktion zu bestimmen."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Überschreibe die Datei aus einem Paket mit einer Datei aus "
 "einem anderen Paket."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir> Überschreibe das Verzeichnis aus einem Paket mit einer "
 "Datei aus einem anderen Paket."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2796,12 +2762,12 @@ msgstr ""
 "einer nicht-umgelenkten."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Verarbeite sogar Pakete mit der falschen Architektur."
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2809,26 +2775,26 @@ msgstr ""
 "wahrscheinlich."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Versuche Sachen zu (de)installieren, selbst falls nicht root."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Installiere ein Paket selbst wenn die Authentizitätsprüfung "
 "fehlschlägt."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<Paket>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2838,13 +2804,13 @@ msgstr ""
 "angezeigt, sonst nichts)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2852,13 +2818,13 @@ msgstr ""
 "Option."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2867,13 +2833,13 @@ msgstr ""
 "eine B<dpkg-deb>(1)-Option."
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2884,7 +2850,7 @@ msgstr ""
 "passieren würde ohne tatsächlich etwas zu modifizieren."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2898,13 +2864,13 @@ msgstr ""
 "dass tatsächlich gar nichts passieren sollte)"
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2916,13 +2882,13 @@ msgstr ""
 "verwendet werden."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
@@ -2931,22 +2897,35 @@ msgstr ""
 "Paketes installiert ist. Dies ist ein Alias für B<--refuse-downgrade>."
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<Verz> | B<--admindir=>I<Verz> | B<--instdir=>I<Verz>"
+msgid "B<--admindir=>I<dir>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--infodir=>I<Infoverzeichnis>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
+#, fuzzy
+msgid ""
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Ändere die Standardverzeichnisse. B<admindir> ist standardmäßig I</var/lib/"
 "dpkg> und enthält viele Dateien, die Informationen über den Status von "
@@ -2959,14 +2938,27 @@ msgstr ""
 "I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<-L>I<libverzeichnis>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2978,13 +2970,13 @@ msgstr ""
 "die Deinstallation-ausgewählt markiert."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2993,13 +2985,13 @@ msgstr ""
 "installiert ist."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -3017,13 +3009,13 @@ msgstr ""
 "useredited distedited« berichtet."
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<Dateiname>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -3048,42 +3040,42 @@ msgstr ""
 "I<E<lt>EntscheidungE<gt>> entweder install oder keep ist."
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "Versuche nicht, Paketsignaturen zu überprüfen."
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Konfigurationsdatei mit Standardeinstellungen der Optionen."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "Standard-Protokolldatei (lesen Sie I</etc/dpkg/dpkg.cfg>(5) und die Option "
 "B<--log>)."
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -3093,24 +3085,24 @@ msgstr ""
 "dieser Dateien ändern können."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Liste der verfügbaren Pakete."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -3122,7 +3114,7 @@ msgstr ""
 "weitere Informationen."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -3131,55 +3123,55 @@ msgstr ""
 "für weitere Informationen über sie:"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "UMGEBUNGSVARIABLEN"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3189,25 +3181,25 @@ msgstr ""
 "»Shell-Escape« durchführt."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "Das Programm, das B<dpkg> ausführen wird, wenn es eine neue Shell startet."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3216,7 +3208,7 @@ msgstr ""
 "formatierten Text anzeigt. Derzeit nur von -l verwendet."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3224,52 +3216,52 @@ msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Um Pakete mit Bezug zum B<vi>(1)-Editor aufzulisten:"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Um die Einträge von zwei Pakete in I</var/lib/dpkg/available> zu sehen:"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "Wenn Sie die Liste der Pakete selbst durchsuchen wollen:"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "Um ein installiertes Elvis-Paket zu entfernen:"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3279,7 +3271,7 @@ msgstr ""
 "Bereich »editors« ist:"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3289,18 +3281,18 @@ msgstr ""
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "Um eine lokale Kopie der Paketauswahl-Zustände zu erstellen:"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>meine_auswahl>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3308,7 +3300,7 @@ msgstr ""
 "folgenden Befehlen installieren:"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3318,12 +3310,13 @@ msgstr ""
 "     B<dpkg --set-selections E<lt>myselections>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Beachten Sie, dass dies nichts wirklich installiert oder entfernt, sondern "
 "lediglich den Auswahlzustand der angeforderten Pakete setzt. Sie werden eine "
@@ -3332,7 +3325,7 @@ msgstr ""
 "und wählen Sie »Installieren«."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3341,22 +3334,23 @@ msgstr ""
 "ist, den Paketauswahlzustand zu ändern."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "ZUSÄTZLICHE FUNKTIONALITÄT"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "Zusätzliche Funktionalität kann durch die Installation jedes der folgenden "
 "Pakete erhalten werden: I<apt>, I<aptitude> und I<debsums>."
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3365,23 +3359,23 @@ msgstr ""
 "(5), B<dpkg.cfg>(5) und B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 "B<--no-act> gibt gewöhnlich weniger Informationen als hilfreich sein könnten."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTOREN"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3396,6 +3390,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, no-wrap
+msgid "2007-03-06"
+msgstr "2007-03-06"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4269,9 +4269,10 @@ msgstr "B<-b>"
 
 # type: Plain text
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 "Spezifiziert einen rein binären Bau, keine Quelldateien sollen gebaut und "
 "oder vertrieben werden, und"
@@ -4290,7 +4291,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, no-wrap
 msgid "B<-S>"
 msgstr "B<-S>"
@@ -4301,63 +4302,65 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
+#, fuzzy
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 "Diese Optionen steuern, ob das Original-Quellarchiv dem durch B<dpkg-"
-"buildpackage> generierten Upload hinzugefügt wird, falls die Quellen erzeugt "
+"genchanges> generierten Upload hinzugefügt wird, falls die Quellen erzeugt "
 "werden (d.h. B<-b> or B<-B> nicht verwendet wurden)."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, no-wrap
 msgid "B<-si>"
 msgstr "B<-si>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
+#, fuzzy
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
-"Nehme die Originalquellen hinzu, falls die Versionsnummer auf B<-0> oder B<-"
-"1> endet, d.h. falls der Debian-Revisionsanteil der Versionsnummer B<0> oder "
-"B<1> lautet. B<Dies ist die Standardeinstellung.>"
+"Standardmäßig, oder falls B<-si> angegeben wird, werden die Originalquellen "
+"hinzugefügt, falls die Versionsnummer auf B<-0> oder B<-1> endet, d.h. der "
+"Debian-Revisionsanteil der Versionsnummer B<0> oder B<1> ist."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, no-wrap
 msgid "B<-sa>"
 msgstr "B<-sa>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr "Erzwingt die Hinzunahme der Originalquellen."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, no-wrap
 msgid "B<-sd>"
 msgstr "B<-sd>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4365,14 +4368,14 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<Version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
@@ -4380,13 +4383,13 @@ msgstr ""
 "I<Version> sind."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B<-C>I<Änderungsbeschreibung>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
@@ -4396,13 +4399,13 @@ msgstr ""
 "verwenden."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr "B<-m>I<Betreueradresse>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4413,13 +4416,13 @@ msgstr ""
 "verwenden."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr "B<-e>I<Betreueradresse>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4430,91 +4433,92 @@ msgstr ""
 "zu verwenden."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 "Überprüfe Bauabhängigkeiten und -konflikte; Abbruch falls nicht erfüllt."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr "Überprüfe Bauabhängigkeiten und -konflikte nicht."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, no-wrap
 msgid "B<-W>"
 msgstr "B<-W>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Berichte bestimmte Fehler nur als Warnung. Nur B<dpkg-source> verwendet dies, "
-"aber B<dpkg-buildpackage> erkennt es und leitet es an B<dpkg-source> weiter."
+"Berichte bestimmte Fehler nur als Warnung. Nur B<dpkg-source> verwendet "
+"dies, aber B<dpkg-buildpackage> erkennt es und leitet es an B<dpkg-source> "
+"weiter."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Verneint vorher gesetzte B<-W>. Nur B<dpkg-source> verwendet dies, "
-"aber B<dpkg-buildpackage> erkennt es und leitet es an B<dpkg-source> weiter."
+"Verneint vorher gesetzte B<-W>. Nur B<dpkg-source> verwendet dies, aber "
+"B<dpkg-buildpackage> erkennt es und leitet es an B<dpkg-source> weiter."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, no-wrap
 msgid "B<-nc>"
 msgstr "B<-nc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, no-wrap
 msgid "B<-tc>"
 msgstr "B<-tc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4529,13 +4533,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4547,71 +4551,64 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, no-wrap
 msgid "B<-us>"
 msgstr "B<-us>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr "Das Quellpaket nicht signieren."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, no-wrap
 msgid "B<-uc>"
 msgstr "B<-uc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr "Die .changes-Datei nicht signieren."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<Dateiname>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 "Wird unverändert an B<dpkg-source> weitergegeben. Kann mehrfach wiederholt "
 "werden."
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr ""
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4621,8 +4618,8 @@ msgstr ""
 "dpkg>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4632,14 +4629,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
 "(1), B<pgp>(1)."
@@ -4701,7 +4698,8 @@ msgstr "B<-h>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+#, fuzzy
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4712,7 +4710,8 @@ msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TH
@@ -4754,7 +4753,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4768,7 +4767,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
@@ -4871,8 +4870,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
-#, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<Archiv> [I<Befehlsdateiname> ...]"
 
 # type: Plain text
@@ -4912,8 +4911,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
-#, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<Archiv> [I<Befehlsfeldname> ...]"
 
 # type: Plain text
@@ -5010,8 +5009,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
-#, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<Archiv-Verzeichnis>"
 
 # type: Plain text
@@ -5174,20 +5173,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> und diese Handbuchseite wurden von Ian Jackson geschrieben. Sie "
-"unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der GNU "
-"General Public License Version 2 oder neuer veröffentlicht; es gibt KEINE "
-"HAFTUNG. Lesen Sie I</usr/share/doc/dpkg/copyright> und I</usr/share/common-"
-"licenses/GPL> für Details."
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -5213,9 +5198,10 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
+#, fuzzy
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5477,10 +5463,11 @@ msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:114
+#, fuzzy
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 "Datei, die die aktuelle Liste von Umleitungen des Systems enthält. Sie "
 "befindet sich im Dpkg-Administrationsverzeichnis, zusammen mit anderen für "
@@ -5488,16 +5475,18 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 "Hinweis: B<dpkg-divert> erhält die alte Kopie dieser Datei, mit der Endung »-"
 "old«, bevor es sie mit der neuen ersetzt."
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+#, fuzzy
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
@@ -5527,61 +5516,46 @@ msgstr ""
 "Debian-Quellcodebaum und aus den darin erzeugten Dateien und erzeugt eine "
 "Debian-Steuerdatei für das Hochladen (die B<.changes>-Datei)."
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-"Dies führt dazu, dass »changelog«-Informationen von allen Versionen, die "
-"strikt neuer als I<Version> sind, verwendet werden."
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-si>, B<-sa>, B<-sd>"
+#: ../../man/dpkg-genchanges.1:18
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>"
+msgstr "B<-b>, B<-B>, B<-S>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
-"Diese Optionen steuern, ob das Original-Quellarchiv dem durch B<dpkg-"
-"genchanges> generierten Upload hinzugefügt wird, falls die Quellen erzeugt "
-"werden (d.h. B<-b> or B<-B> nicht verwendet wurden)."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
-"Standardmäßig, oder falls B<-si> angegeben wird, werden die Originalquellen "
-"hinzugefügt, falls die Versionsnummer auf B<-0> oder B<-1> endet, d.h. der "
-"Debian-Revisionsanteil der Versionsnummer B<0> oder B<1> ist."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
-"B<-sa> erzwingt die Hinzunahme der Originalquellen; B<-sd> erzwingt deren "
-"Fortlassung und enthält nur den Diff."
+"Dies führt dazu, dass »changelog«-Informationen von allen Versionen, die "
+"strikt neuer als I<Version> sind, verwendet werden."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<Name>B<=>I<Wert>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -5590,14 +5564,14 @@ msgstr ""
 "eine Besprechung des Ausgabesubstitution."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<substvardatei>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5607,74 +5581,54 @@ msgstr ""
 "B<debian/substvars>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<Feld>B<=>I<Wert>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr "Überschreibe oder ergänze eine Ausgabe-Steuerdatei-Feld."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<field>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr "Entferne ein Ausgabe-Steuerdatei-Feld."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-b>, B<-B>, B<-S>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5682,21 +5636,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5705,13 +5659,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5719,13 +5673,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, no-wrap
 msgid "B<-q>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5733,7 +5687,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5745,6 +5699,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "dpkg-gencontrol"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, no-wrap
+msgid "2007-06-12"
+msgstr "2007-06-12"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -6093,15 +6054,10 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> ist Freie Software; "
-"lesen Sie die GNU General Public License Version 2 oder neuer für die "
-"Kopierbedingungen. Es gibt B<keine> Haftung."
+#: ../../man/dpkg-name.1:107
+#, fuzzy
+msgid "Copyright 1995,1996 Erick Branderhorst"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -6187,8 +6143,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:14
-#, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<-l>, B<--list> I<Paketname-Muster> ..."
 
 # type: Plain text
@@ -6230,8 +6186,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:33
-#, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<-W>, B<--show> I<Paketname-Muster> ..."
 
 # type: Plain text
@@ -6252,8 +6208,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:40
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-s>, B<--status> I<Paketname> ..."
 
 # type: Plain text
@@ -6267,14 +6223,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:44
-#, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<Paketname> ..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 "Aufführen von Dateien, die durch B<Paketname> installiert wurden. Beachten "
@@ -6283,8 +6240,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
-#, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<Dateiname-Suchmuster> ..."
 
 # type: Plain text
@@ -6301,8 +6258,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:55
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<Paketname>"
 
 # type: Plain text
@@ -6452,8 +6409,9 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
+#, fuzzy
+msgid "Copyright (C) 2001 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: UR
 #: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83
@@ -7131,117 +7089,166 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> mit B<-b>"
+msgid "B<Build options (with -b):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
-msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:180
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
-msgid "In all cases any existing original source tree will be removed."
+#: ../../man/dpkg-source.1:186
+msgid ""
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<-si>, B<-sa>, B<-sd>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:212
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:212
+#, no-wrap
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:216
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
+#: ../../man/dpkg-source.1:222
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:225
+#, fuzzy
+msgid "Unpacks the original source tree."
+msgstr "Erzwingt die Hinzunahme der Originalquellen."
+
+# type: Plain text
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -7249,7 +7256,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
@@ -7725,20 +7732,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-split> und diese Handbuchseite wurden von Ian Jackson geschrieben. "
-"Sie unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der GNU "
-"General Public License Version 2 oder neuer veröffentlicht; es gibt KEINE "
-"HAFTUNG. Lesen Sie I</usr/share/doc/dpkg/copyright> und I</usr/share/common-"
-"licenses/GPL> für Details."
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7918,11 +7911,6 @@ msgstr ""
 "Hinweis: B<dpkg-statoverride> erhält die alte Kopie dieser Datei mit der "
 "Endung »-old« bevor es sie mit einer neuen ersetzt."
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
 # type: TH
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -8971,8 +8959,8 @@ msgid ""
 "with B<gzip>; if it doesn't exist, but a corresponding I<filename>B<.gz> "
 "does, the latter is used instead."
 msgstr ""
-"Falls I<Dateiname> auf B<.gz> endet, wird er als Verweis auf eine mit B<gzip> "
-"komprimierte Datei genommen; falls er nicht existiert, aber eine "
+"Falls I<Dateiname> auf B<.gz> endet, wird er als Verweis auf eine mit "
+"B<gzip> komprimierte Datei genommen; falls er nicht existiert, aber eine "
 "entsprechende I<Dateiname>B<.gz> existiert, wird stattdessen letztere "
 "benutzt."
 
@@ -9066,10 +9054,10 @@ msgstr ""
 "dass I<Dateiname> als exakter Eintrag angesehen wird, der entfernt werden "
 "soll, statt als Name einer existierenden Datei. Dies kann wichtig sein, wenn "
 "Einträge entfernt werden sollen, die sich auf Info-Dateien in "
-"Unterverzeichnisssen beziehen (z.B. »emacs-20/emacs«), da B<--remove> mit dem "
-"Basisnamen (»basename«) des übergebenen I<Dateiname>ns, statt des exakten "
-"Namens, arbeiten wird (d.h. B<--remove> »emacs-20/emacs« würde dazu führen, "
-"dass B<install-info> nach »emacs« und nicht »emacs-20/emacs« sucht)."
+"Unterverzeichnisssen beziehen (z.B. »emacs-20/emacs«), da B<--remove> mit "
+"dem Basisnamen (»basename«) des übergebenen I<Dateiname>ns, statt des "
+"exakten Namens, arbeiten wird (d.h. B<--remove> »emacs-20/emacs« würde dazu "
+"führen, dass B<install-info> nach »emacs« und nicht »emacs-20/emacs« sucht)."
 
 # type: TP
 #: ../../man/install-info.8:119
@@ -9410,15 +9398,10 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<emacs>(1), B<info>(1), B<gzip(1).>"
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
-msgstr ""
-"Copyright 1994, Ian Jackson. B<install-info> ist Freie Software; lesen Sie "
-"die GNU General Public License Version 2 oder neuer für die "
-"Kopierbedingungen. Es gibt I<keine> Haftung."
+#: ../../man/install-info.8:293
+#, fuzzy
+msgid "Copyright 1994 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -10275,8 +10258,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/update-alternatives.8:204
-#, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+#, fuzzy, no-wrap
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<Genname Symlink Altern Priorität> [B<--slave> I<Genname Symlink Altern>] ..."
 
 # type: Plain text
@@ -10654,36 +10637,19 @@ msgstr ""
 "in der Implementation oder in der Dokumentation; bitte melden Sie dies."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-msgstr ""
-"Debian update-alternatives unterliegt dem Copyright 1995 von Ian Jackson. Es "
-"ist Freie Software; lesen Sie die GNU General Public License Version 2 oder "
-"neuer für die Kopierbedingungen. Es gibt KEINE HAFTUNG."
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Diese Handbuchseite unterliegt dem Copyright 1997/98 von Charles Briscoe-"
-"Smith. Dies ist Freie Dokumentation; lesen Sie die GNU General Public "
-"License Version 2 oder neuer für die Kopierbedingungen. Es gibt KEINE "
-"HAFTUNG."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
+#, fuzzy
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Sie können die GNU GPL auf Debian-Systemen unter /usr/share/common-licenses/"
-"GPL finden."
+"Dies ist Freie Software; lesen Sie die GNU General Public License Version 2 "
+"oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:405
@@ -10692,6 +10658,163 @@ msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Dies ist Freie Software; lesen Sie die GNU General Public License Version "
+#~ "2 oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
+
+# type: Plain text
+#~ msgid "The utilities and this manpage were written by Ian Jackson."
+#~ msgstr ""
+#~ "Diese Hilfsprogramme und diese Handbuchseite wurden von Ian Jackson "
+#~ "geschrieben."
+
+# type: SH
+#~ msgid "COPYRIGHT"
+#~ msgstr "COPYRIGHT"
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<Verz> | B<--admindir=>I<Verz> | B<--instdir=>I<Verz>"
+
+# type: Plain text
+#~ msgid ""
+#~ "These options control whether the original source archive is included in "
+#~ "the upload generated by B<dpkg-buildpackage> if any source is being "
+#~ "generated (i.e., B<-b> or B<-B> haven't been used)."
+#~ msgstr ""
+#~ "Diese Optionen steuern, ob das Original-Quellarchiv dem durch B<dpkg-"
+#~ "buildpackage> generierten Upload hinzugefügt wird, falls die Quellen "
+#~ "erzeugt werden (d.h. B<-b> or B<-B> nicht verwendet wurden)."
+
+# type: Plain text
+#~ msgid ""
+#~ "Include the original source if the version number ends in B<-0> or B<-1>, "
+#~ "i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
+#~ "B<This is the default.>"
+#~ msgstr ""
+#~ "Nehme die Originalquellen hinzu, falls die Versionsnummer auf B<-0> oder "
+#~ "B<-1> endet, d.h. falls der Debian-Revisionsanteil der Versionsnummer "
+#~ "B<0> oder B<1> lautet. B<Dies ist die Standardeinstellung.>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> und diese Handbuchseite wurden von Ian Jackson geschrieben. "
+#~ "Sie unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der "
+#~ "GNU General Public License Version 2 oder neuer veröffentlicht; es gibt "
+#~ "KEINE HAFTUNG. Lesen Sie I</usr/share/doc/dpkg/copyright> und I</usr/"
+#~ "share/common-licenses/GPL> für Details."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+#~ "exclusion and includes only the diff."
+#~ msgstr ""
+#~ "B<-sa> erzwingt die Hinzunahme der Originalquellen; B<-sd> erzwingt deren "
+#~ "Fortlassung und enthält nur den Diff."
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> ist Freie Software; "
+#~ "lesen Sie die GNU General Public License Version 2 oder neuer für die "
+#~ "Kopierbedingungen. Es gibt B<keine> Haftung."
+
+# type: Plain text
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Copyright 2001 Wichert Akkerman"
+
+# type: TP
+#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> mit B<-b>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-split> und diese Handbuchseite wurden von Ian Jackson geschrieben. "
+#~ "Sie unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der "
+#~ "GNU General Public License Version 2 oder neuer veröffentlicht; es gibt "
+#~ "KEINE HAFTUNG. Lesen Sie I</usr/share/doc/dpkg/copyright> und I</usr/"
+#~ "share/common-licenses/GPL> für Details."
+
+# type: Plain text
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1994, Ian Jackson. B<install-info> ist Freie Software; lesen "
+#~ "Sie die GNU General Public License Version 2 oder neuer für die "
+#~ "Kopierbedingungen. Es gibt I<keine> Haftung."
+
+# type: Plain text
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives unterliegt dem Copyright 1995 von Ian Jackson. "
+#~ "Es ist Freie Software; lesen Sie die GNU General Public License Version 2 "
+#~ "oder neuer für die Kopierbedingungen. Es gibt KEINE HAFTUNG."
+
+# type: Plain text
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Diese Handbuchseite unterliegt dem Copyright 1997/98 von Charles Briscoe-"
+#~ "Smith. Dies ist Freie Dokumentation; lesen Sie die GNU General Public "
+#~ "License Version 2 oder neuer für die Kopierbedingungen. Es gibt KEINE "
+#~ "HAFTUNG."
+
+# type: Plain text
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "Sie können die GNU GPL auf Debian-Systemen unter /usr/share/common-"
+#~ "licenses/GPL finden."
+
 # type: TH
 #~ msgid "2006-04-09"
 #~ msgstr "2006-04-09"
@@ -10748,8 +10871,7 @@ msgstr ""
 
 # type: Plain text
 #~ msgid "Print a usage message."
-#~ msgstr ""
-#~ "Gebe einen Bedienungshinweis aus.\n"
+#~ msgstr "Gebe einen Bedienungshinweis aus.\n"
 
 # type: Plain text
 #~ msgid "Print program version."
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 44d6d6aa..2f0f43a6 100644
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,7 +81,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293 ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14 ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27 ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38 ../../man/dpkg-genchanges.1:17 ../../man/dpkg-gencontrol.1:16 ../../man/dpkg-name.1:28 ../../man/dpkg-parsechangelog.1:15 ../../man/dpkg-query.1:69 ../../man/dpkg-scanpackages.1:70 ../../man/dpkg-scansources.1:45 ../../man/dpkg-shlibdeps.1:36 ../../man/dpkg-source.1:65 ../../man/dpkg-split.1:137 ../../man/dpkg-statoverride.8:51 ../../man/dselect.1:45 ../../man/install-info.8:39 ../../man/start-stop-daemon.8:80 ../../man/update-alternatives.8:302
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294 ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14 ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27 ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38 ../../man/dpkg-genchanges.1:17 ../../man/dpkg-gencontrol.1:16 ../../man/dpkg-name.1:28 ../../man/dpkg-parsechangelog.1:15 ../../man/dpkg-query.1:69 ../../man/dpkg-scanpackages.1:70 ../../man/dpkg-scansources.1:45 ../../man/dpkg-shlibdeps.1:36 ../../man/dpkg-source.1:65 ../../man/dpkg-split.1:137 ../../man/dpkg-statoverride.8:51 ../../man/dselect.1:45 ../../man/install-info.8:39 ../../man/start-stop-daemon.8:80 ../../man/update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "B<822-date> does not take any arguments or options."
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 ../../man/deb-substvars.5:125 ../../man/dpkg.1:609 ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221 ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241 ../../man/dpkg-split.1:200 ../../man/dselect.1:427 ../../man/update-alternatives.8:383
+#: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 ../../man/dpkg-split.1:200 ../../man/dselect.1:427 ../../man/update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -103,7 +103,7 @@ msgid "This facility really ought to be part of B<date>(1)."
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 ../../man/deb-control.5:206 ../../man/deb-old.5:51 ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129 ../../man/dpkg.1:599 ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252 ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 ../../man/dselect.cfg.5:21 ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 ../../man/deb-control.5:206 ../../man/deb-old.5:51 ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 ../../man/dselect.cfg.5:21 ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -114,7 +114,7 @@ msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:33 ../../man/cleanup-info.8:54 ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/822-date.1:33 ../../man/cleanup-info.8:54 ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -136,9 +136,9 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1 ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2 ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1 ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1 ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1 ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2 ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5 ../../man/update-alternatives.8:8
 #, no-wrap
-msgid "2007-03-06"
+msgid "2007-07-18"
 msgstr ""
 
 # type: Plain text
@@ -200,29 +200,29 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121 ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235 ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121 ../../man/install-info.8:205 ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30 ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59 ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47 ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30 ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130 ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59 ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47 ../../man/update-alternatives.8:298
 msgid "Show the usage message and exit."
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128 ../../man/install-info.8:210 ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247 ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130 ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128 ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67 ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38 ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73 ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104 ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39 ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87 ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115 ../../man/dpkg-source.1:64 ../../man/dpkg-split.1:133 ../../man/dpkg-statoverride.8:50 ../../man/update-alternatives.8:301
+#: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67 ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38 ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73 ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104 ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39 ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87 ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115 ../../man/dpkg-source.1:64 ../../man/dpkg-split.1:133 ../../man/dpkg-statoverride.8:50 ../../man/update-alternatives.8:301
 msgid "Show the version and exit."
 msgstr ""
 
 # type: SH
-#: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12 ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
+#: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -252,14 +252,14 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38 ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157 ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38 ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 
 # type: TH
@@ -945,12 +945,6 @@ msgstr ""
 msgid "deb-substvars"
 msgstr ""
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1 ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1 ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1 ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5 ../../man/update-alternatives.8:8
-#, no-wrap
-msgid "2007-06-12"
-msgstr ""
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1187,7 +1181,7 @@ msgid "List of substitution variables and values."
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1201,33 +1195,15 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105 ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195 ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158 ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193 ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246 ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160 ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52 ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195 ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148 ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52 ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251 ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199 ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162 ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1485,7 +1461,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:93
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr ""
 
 # type: Plain text
@@ -1543,7 +1519,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:124
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+msgid "B<--unpack >I<package_file>..."
 msgstr ""
 
 # type: Plain text
@@ -1556,7 +1532,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:129
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 # type: Plain text
@@ -1586,9 +1562,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:144
 #, no-wrap
-msgid ""
-"B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | "
-"B<--pending>"
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 # type: Plain text
@@ -1626,7 +1600,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:167
 #, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr ""
 
 # type: Plain text
@@ -1650,7 +1624,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:179
 #, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr ""
 
 # type: Plain text
@@ -1664,7 +1638,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:185
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+msgid "B<--forget-old-unavail>"
 msgstr ""
 
 # type: Plain text
@@ -1675,7 +1649,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:188
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
+msgid "B<--clear-avail>"
 msgstr ""
 
 # type: Plain text
@@ -1686,7 +1660,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:191
 #, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
+msgid " B<-C>, B<--audit>"
 msgstr ""
 
 # type: Plain text
@@ -1699,7 +1673,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:196
 #, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr ""
 
 # type: Plain text
@@ -1712,7 +1686,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:200
 #, no-wrap
-msgid "B<dpkg --set-selections>"
+msgid "B<--set-selections>"
 msgstr ""
 
 # type: Plain text
@@ -1727,7 +1701,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:206
 #, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "B<--clear-selections>"
 msgstr ""
 
 # type: Plain text
@@ -1741,7 +1715,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:211
 #, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+msgid "B<--yet-to-unpack>"
 msgstr ""
 
 # type: Plain text
@@ -1754,7 +1728,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:216
 #, no-wrap
-msgid "B<dpkg --print-architecture>"
+msgid "B<--print-architecture>"
 msgstr ""
 
 # type: Plain text
@@ -1765,7 +1739,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:219
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 # type: Plain text
@@ -1784,23 +1758,17 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:230
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:235
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr ""
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -1809,7 +1777,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:238
 #, no-wrap
-msgid "B<dpkg --force-help>"
+msgid "B<--force-help>"
 msgstr ""
 
 # type: Plain text
@@ -1820,7 +1788,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:241
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<-Dh>, B<--debug=help>"
 msgstr ""
 
 # type: Plain text
@@ -1831,7 +1799,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:244
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<--licence>, B<--license>"
 msgstr ""
 
 # type: Plain text
@@ -1839,12 +1807,6 @@ msgstr ""
 msgid "Display B<dpkg> licence."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr ""
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -1865,24 +1827,24 @@ msgstr ""
 #: ../../man/dpkg.1:273
 #, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 
 # type: TP
@@ -1897,24 +1859,24 @@ msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:291
+#: ../../man/dpkg.1:292
 #, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in "
-"I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -1923,24 +1885,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -1949,13 +1911,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -1963,7 +1925,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -1980,13 +1942,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified "
@@ -1995,7 +1957,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts "
 "only. Using them without fully understanding their effects may break your "
@@ -2003,19 +1965,19 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2025,19 +1987,19 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2045,7 +2007,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered "
 "essential. Essential packages contain mostly very basic Unix "
@@ -2054,31 +2016,31 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2086,7 +2048,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2094,7 +2056,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2103,85 +2065,85 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 #, no-wrap
-msgid "B<--new> | B<--old>"
+msgid "B<--new>, B<--old>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any "
 "changes. This is used to see what would happen with the specified action, "
@@ -2189,7 +2151,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2198,13 +2160,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
+msgid "B<-R>, B<--recursive>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2212,45 +2174,68 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
+#, no-wrap
+msgid "B<--admindir=>I<dir>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/dpkg.1:465
+msgid ""
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:465
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<--root=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:469
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to "
 "I<dir>B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:469
 #, no-wrap
-msgid "B<-O> | B<--selected-only>"
+msgid "B<-O>, B<--selected-only>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:469
+#: ../../man/dpkg.1:475
 msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
@@ -2259,26 +2244,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:469
+#: ../../man/dpkg.1:475
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+msgid "B<-E>, B<--skip-same-version>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -2289,13 +2274,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2309,64 +2294,64 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2374,150 +2359,150 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246 ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 ../../man/update-alternatives.8:356
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 ../../man/update-alternatives.8:356
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -2525,23 +2510,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -2549,54 +2534,54 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), "
 "B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193 ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156 ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257 ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -2609,6 +2594,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr ""
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, no-wrap
+msgid "2007-03-06"
+msgstr ""
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid "dpkg-architecture - set and determine the architecture for package building"
@@ -3352,7 +3343,7 @@ msgstr ""
 #: ../../man/dpkg-buildpackage.1:19
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 
 # type: TP
@@ -3369,7 +3360,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, no-wrap
 msgid "B<-S>"
 msgstr ""
@@ -3380,57 +3371,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated "
-"(i.e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or "
+"B<-B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, no-wrap
 msgid "B<-si>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, "
-"i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, no-wrap
 msgid "B<-sa>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, no-wrap
 msgid "B<-sd>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -3438,37 +3429,37 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18 ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50 ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -3476,13 +3467,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -3490,86 +3481,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, no-wrap
 msgid "B<-D>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, no-wrap
 msgid "B<-d>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, no-wrap
 msgid "B<-W>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but "
 "B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, no-wrap
 msgid "B<-E>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but "
 "B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, no-wrap
 msgid "B<-nc>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, no-wrap
 msgid "B<-tc>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 #.  what happens, if it contains spaces? (hs)
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -3584,13 +3575,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -3602,88 +3593,82 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, no-wrap
 msgid "B<-us>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, no-wrap
 msgid "B<-uc>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr ""
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23 ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23 ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is "
 "I</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32 ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139 ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56 ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59 ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109 ../../man/dpkg-source.1:58 ../../man/dpkg-split.1:127
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32 ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127 ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56 ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59 ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109 ../../man/dpkg-source.1:58 ../../man/dpkg-split.1:127
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
 "B<gpg>(1), B<pgp>(1)."
@@ -3735,7 +3720,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr ""
 
 # type: UR
@@ -3746,7 +3731,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr ""
 
 # type: TH
@@ -3787,7 +3772,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
 msgstr ""
@@ -3800,7 +3785,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147 ../../man/dpkg-gencontrol.1:111
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135 ../../man/dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
 msgstr ""
@@ -3899,7 +3884,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-deb.1:78
 #, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr ""
 
 # type: Plain text
@@ -3940,7 +3925,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-deb.1:101
 #, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr ""
 
 # type: Plain text
@@ -4038,7 +4023,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-deb.1:151
 #, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr ""
 
 # type: Plain text
@@ -4194,16 +4179,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See "
-"I</usr/share/doc/dpkg/copyright> and I</usr/share/common-licenses/GPL> for "
-"details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -4230,8 +4205,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -4452,19 +4427,19 @@ msgstr ""
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
 msgid ""
 "Note: B<dpkg-divert> preserves the old copy of this file, with extension "
-"\"-old\", before replacing it with the new one."
+"I<-old>, before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -4491,151 +4466,124 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
+msgid "B<-b>, B<-B>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated "
-"(i.e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20 ../../man/dpkg-source.1:85
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20 ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24 ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24 ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30 ../../man/dpkg-source.1:95
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30 ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is "
 "B<debian/substvars>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30 ../../man/dpkg-source.1:95
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30 ../../man/dpkg-source.1:95
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33 ../../man/dpkg-source.1:98
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33 ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33 ../../man/dpkg-source.1:98
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33 ../../man/dpkg-source.1:98
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36 ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no "
-"architecture-independent binary package files are to be distributed either.  "
-"B<-S> specifies that only the source should be uploaded and no binary "
-"packages need to be made. The distinction between B<-b> and B<-B> is only "
-"used by B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> "
-"file for whatever files were produced by the B<binary-*> target(s) of the "
-"package being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36 ../../man/dpkg-source.1:66
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36 ../../man/dpkg-source.1:66
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41 ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41 ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46 ../../man/dpkg-parsechangelog.1:21
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46 ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using "
 "B<debian/files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50 ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50 ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55 ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55 ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
 "special line near the bottom of the changelog or failing that defaults to "
@@ -4643,13 +4591,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -4657,13 +4605,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, no-wrap
 msgid "B<-q>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -4671,7 +4619,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -4683,6 +4631,12 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr ""
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, no-wrap
+msgid "2007-06-12"
+msgstr ""
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -4987,11 +4941,8 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying "
-"conditions. There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+msgid "Copyright 1995,1996 Erick Branderhorst"
 msgstr ""
 
 # type: TH
@@ -5070,7 +5021,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr ""
 
 # type: Plain text
@@ -5103,7 +5054,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr ""
 
 # type: Plain text
@@ -5119,7 +5070,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr ""
 
 # type: Plain text
@@ -5132,20 +5083,20 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
 #, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr ""
 
 # type: Plain text
@@ -5159,7 +5110,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr ""
 
 # type: Plain text
@@ -5272,7 +5223,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
+msgid "Copyright (C) 2001 Wichert Akkerman"
 msgstr ""
 
 # type: UR
@@ -5846,117 +5797,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than "
-"B<-sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, "
+"B<-sU> and B<-sR> should be used instead."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, no-wrap
+msgid "B<-sk>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and "
-"B<dpkg-source> will create a new original source archive from it. If B<-sr> "
-"is used B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, no-wrap
+msgid "B<-sp>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:173
-msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, no-wrap
+msgid "B<-su>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, no-wrap
+msgid "B<-sr>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:211
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, no-wrap
+msgid "B<-ss>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:180
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, "
-"B<-sU> and B<-sR> should be used instead."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<-sn>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
-msgid "In all cases any existing original source tree will be removed."
+#: ../../man/dpkg-source.1:186
+msgid ""
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, no-wrap
+msgid "B<-sa> or B<-sA>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:212
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to "
+"B<-sp>); if a directory is found it will pack it to create the original "
+"source and remove it afterwards (this is equivalent to B<-sr>); if neither "
+"is found it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if "
+"B<-sA> was specified (this is equivalent to B<-sP>)  or raise an error if "
+"B<-sa> was specified.  B<-sA> is the default."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:212
+#, no-wrap
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:216
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
+#: ../../man/dpkg-source.1:222
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
+msgstr ""
+
+# type: Plain text
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, "
@@ -5964,7 +5963,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
@@ -6348,16 +6347,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See "
-"I</usr/share/doc/dpkg/copyright> and I</usr/share/common-licenses/GPL> for "
-"details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -6499,11 +6488,6 @@ msgid ""
 "extension \"-old\", before replacing it with the new one."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr ""
-
 # type: TH
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -7834,11 +7818,8 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+msgid "Copyright 1994 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -8510,7 +8491,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "B<--install> I<genname symlink altern priority> [B<--slave> I<genname "
-"symlink altern>] ..."
+"symlink altern>]..."
 msgstr ""
 
 # type: Plain text
@@ -8814,26 +8795,15 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-msgstr ""
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
 
 # type: Plain text
diff --git a/man/po/es.po b/man/po/es.po
index 656a2ef1..b40ac35d 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -184,9 +184,9 @@ msgstr "B<822-date> no lleva ning
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, fuzzy, no-wrap
@@ -213,15 +213,16 @@ msgstr "Esta funcionalidad en realidad deber
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -244,9 +245,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
@@ -268,11 +270,15 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, no-wrap
-msgid "2007-03-06"
+msgid "2007-07-18"
 msgstr ""
 
 # type: Plain text
@@ -357,19 +363,20 @@ msgstr ""
 "correcto!\""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -381,25 +388,25 @@ msgid "Show the usage message and exit."
 msgstr "Muestra el modo de uso y termina."
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -411,13 +418,12 @@ msgstr "Muestra la versi
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, fuzzy, no-wrap
 msgid "FILES"
 msgstr ""
@@ -456,17 +462,23 @@ msgstr "B<install-info>(8), B<info>(1)."
 # type: Plain text
 #: ../../man/cleanup-info.8:56
 #, fuzzy
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Esto es software libre; vea la versión 2 o posterior de la Licencia Pública "
 "General GNU para condiciones de copia.  NO hay ninguna garantía."
@@ -1422,19 +1434,6 @@ msgstr "B<dpkg-shlibdeps> I<opciones>"
 msgid "deb-substvars"
 msgstr "B<debian/substvars>"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, no-wrap
-msgid "2007-06-12"
-msgstr ""
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1733,7 +1732,7 @@ msgid "List of substitution variables and values."
 msgstr "Lista de variables de sustitución y sus valores."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 #, fuzzy
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
@@ -1751,50 +1750,25 @@ msgid ""
 msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-#, fuzzy
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-"Las herramientas y esta página del manual fueron escritas por Ian Jackson."
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, fuzzy, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 #, fuzzy
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 #, fuzzy
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright (C) 2000 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Esto es software libre; vea la versión 2 o posterior de la Licencia Pública "
-"General GNU para condiciones de copia.  NO hay ninguna garantía."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -2110,7 +2084,7 @@ msgstr "ACCIONES"
 # type: TP
 #: ../../man/dpkg.1:93
 #, fuzzy, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
 
 # type: Plain text
@@ -2189,7 +2163,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:124
 #, fuzzy, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<fichero_paquete> ..."
 
 # type: Plain text
@@ -2205,7 +2179,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:129
 #, fuzzy, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<paquete> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2245,7 +2219,7 @@ msgstr "B<2.> Se ejecuta el programa I<postinst>, si el paquete lo tiene."
 # type: TP
 #: ../../man/dpkg.1:144
 #, fuzzy, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paquete> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2296,7 +2270,7 @@ msgstr "B<3.> Ejecutar el programa I<postrm>."
 # type: TP
 #: ../../man/dpkg.1:167
 #, fuzzy, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<fichero-Packages>"
 
 # type: Plain text
@@ -2329,7 +2303,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:179
 #, fuzzy, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<fichero_paquete> ..."
 
 # type: Plain text
@@ -2347,7 +2321,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:185
 #, fuzzy, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2359,7 +2333,7 @@ msgstr "Olvida los paquetes no instalados ni disponibles."
 # type: TP
 #: ../../man/dpkg.1:188
 #, fuzzy, no-wrap
-msgid "B<dpkg --clear-avail>"
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2371,8 +2345,8 @@ msgstr "Borra la informaci
 # type: TP
 #: ../../man/dpkg.1:191
 #, fuzzy, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2387,7 +2361,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:196
 #, fuzzy, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
@@ -2401,7 +2375,7 @@ msgstr "Muestra la lista de selecciones de paquetes en la salida est
 # type: TP
 #: ../../man/dpkg.1:200
 #, fuzzy, no-wrap
-msgid "B<dpkg --set-selections>"
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2419,7 +2393,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:206
 #, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2433,7 +2407,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:211
 #, fuzzy, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2449,7 +2423,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:216
 #, fuzzy, no-wrap
-msgid "B<dpkg --print-architecture>"
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2464,7 +2438,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:219
 #, fuzzy, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2492,14 +2466,14 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:230
 #, fuzzy, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2508,12 +2482,6 @@ msgstr ""
 "órdenes y mediante este descriptor de fichero no se desactivan en las "
 "subsiguientes llamadas efectuadas en la misma ejecución."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, fuzzy, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 #, fuzzy
@@ -2523,7 +2491,7 @@ msgstr "Muestra las instrucciones de uso."
 # type: TP
 #: ../../man/dpkg.1:238
 #, fuzzy, no-wrap
-msgid "B<dpkg --force-help>"
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2532,11 +2500,11 @@ msgstr "B<dpkg --force-help>"
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Muestra la ayuda de las opciones B<--force->I<algo>."
 
-# type: TP
+# type: IP
 #: ../../man/dpkg.1:241
 #, fuzzy, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--debug>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2547,8 +2515,8 @@ msgstr "Muestra la ayuda de las opciones de depuraci
 # type: TP
 #: ../../man/dpkg.1:244
 #, fuzzy, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence | --license>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
@@ -2556,12 +2524,6 @@ msgstr "B<dpkg --licence> | B<dpkg --license>"
 msgid "Display B<dpkg> licence."
 msgstr "Muestra la licencia e información sobre derechos de autor de B<dpkg>."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, fuzzy, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 #, fuzzy
@@ -2584,24 +2546,24 @@ msgstr "Ver B<dpkg-dev>(1) para m
 #: ../../man/dpkg.1:273
 #, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<directorio> [I<fichero>]\n"
 "    Construye un paquete Debian GNU/Linux.\n"
@@ -2634,19 +2596,20 @@ msgstr ""
 "Vea B<dpkg-query>(1) para más información sobre las siguientes acciones:"
 
 # type: Plain text
-#: ../../man/dpkg.1:291
+#: ../../man/dpkg.1:292
 #, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<patrón-nombre-paquete> ...\n"
 "    Lista los paquetes cuyo nombre encaja en el patrón dado.\n"
@@ -2660,7 +2623,7 @@ msgstr ""
 "    Imprime información sobre el I<paquete>, sacada de I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 #, fuzzy
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
@@ -2675,13 +2638,13 @@ msgstr ""
 "con B<#>)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, fuzzy, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<número>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
@@ -2689,13 +2652,13 @@ msgstr ""
 "50."
 
 # type: TP
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, fuzzy, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 #, fuzzy
 msgid ""
 "When a package is removed, there is a possibility that another installed "
@@ -2708,13 +2671,13 @@ msgstr ""
 "que dependía del borrado."
 
 # type: TP
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 #, fuzzy, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 #, fuzzy
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
@@ -2727,7 +2690,7 @@ msgstr ""
 "B<-Dh> o B<--debug=help> muestran estos valores."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, fuzzy, no-wrap
 msgid ""
 " number  description\n"
@@ -2755,13 +2718,13 @@ msgstr ""
 " 2000   Montañas de parrafadas (perjudica la salud)\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, fuzzy, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<cosas> | B<--no-force->I<cosas> | B<--refuse->I<cosas>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 #, fuzzy
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
@@ -2775,7 +2738,7 @@ msgstr ""
 "las describe. Las cosas marcadas con (*) se fuerzan por omisión."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 #, fuzzy
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
@@ -2787,13 +2750,13 @@ msgstr ""
 "su sistema dejara de funcionar.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Activa (o desactiva) todas las opciones de forzar."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 #, fuzzy
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
@@ -2803,7 +2766,7 @@ msgstr ""
 "instalada."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 #, fuzzy
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
@@ -2819,7 +2782,7 @@ msgstr ""
 "su sistema completo. Úselo con cuidado.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 #, fuzzy
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
@@ -2829,7 +2792,7 @@ msgstr ""
 "sobre lo que depende el paquete."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 #, fuzzy
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
@@ -2837,7 +2800,7 @@ msgstr ""
 "«hold» (mantener)."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 #, fuzzy
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
@@ -2849,7 +2812,7 @@ msgstr ""
 "partes del paquete quedaran en el sistema, pero B<dpkg> se olvidara de ellas."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 #, fuzzy
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
@@ -2862,13 +2825,13 @@ msgstr ""
 "que use esta opción con cuidado."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 #, fuzzy
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Convierte todos los problemas de dependencias en avisos."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 #, fuzzy
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
@@ -2877,7 +2840,7 @@ msgstr ""
 "dependencias."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 #, fuzzy
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
@@ -2887,7 +2850,7 @@ msgstr ""
 "opción es peligrosa, dado que generalmente sobreescribirá algunos ficheros."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 #, fuzzy
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
@@ -2897,7 +2860,7 @@ msgstr ""
 "peligroso porque no guarda los cambios (el borrado) hechos al fichero."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 #, fuzzy
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
@@ -2909,7 +2872,7 @@ msgstr ""
 "la opción --force-confdef, en cuyo caso se toma la acción por omisión."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 #, fuzzy
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
@@ -2922,7 +2885,7 @@ msgstr ""
 "omisión."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 #, fuzzy
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
@@ -2936,20 +2899,20 @@ msgstr ""
 "cuyo caso se usará esta opción para tomar la decisión final."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 #, fuzzy
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite>: Sobreescribe un fichero de un paquete con otro fichero."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 #, fuzzy
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: Sobreescribe un directorio de un paquete con otro fichero."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 #, fuzzy
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
@@ -2958,7 +2921,7 @@ msgstr ""
 "una no desviada."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 #, fuzzy
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
@@ -2966,7 +2929,7 @@ msgstr ""
 "adecuada."
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 #, fuzzy
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
@@ -2975,13 +2938,13 @@ msgstr ""
 "bastante posible que haya problemas."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 #, fuzzy
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root>: Intentar la (des)instalación incluso si no se es root."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 #, fuzzy
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
@@ -2989,13 +2952,13 @@ msgstr ""
 "autenticidad."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, fuzzy, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paquete>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 #, fuzzy
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
@@ -3006,13 +2969,13 @@ msgstr ""
 "abortar el proceso)."
 
 # type: TP
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 #, fuzzy, no-wrap
-msgid "B<--new> | B<--old>"
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 #, fuzzy
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
@@ -3021,13 +2984,13 @@ msgstr ""
 "(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, fuzzy, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, fuzzy
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
@@ -3037,13 +3000,13 @@ msgstr ""
 "construye el paquete. Es una opción de B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, fuzzy, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 #, fuzzy
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
@@ -3055,7 +3018,7 @@ msgstr ""
 "cambiar nada."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 #, fuzzy
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
@@ -3069,13 +3032,13 @@ msgstr ""
 "act, ¡aunque probablemente usted esperara que no hiciera nada!)."
 
 # type: TP
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 #, fuzzy, no-wrap
-msgid "B<-R> | B<--recursive>"
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, fuzzy
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
@@ -3088,13 +3051,13 @@ msgstr ""
 "B<--unpack> y B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, fuzzy, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 #, fuzzy
 msgid ""
 "Don't install a package if a newer version of the same package is already "
@@ -3104,23 +3067,35 @@ msgstr ""
 "mismo que B<--refuse-downgrade>."
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, fuzzy, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir> I<directorio>"
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir> I<directorio>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Cambia los directorios por omisión. El valor predeterminado para el "
 "directorio B<admindir> es I</var/lib/dpkg> y contiene muchos ficheros con "
@@ -3132,13 +3107,26 @@ msgstr ""
 "cambia a su vez B<instdir> a I<dir> y B<admindir> a I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:465
 #, fuzzy, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir> I<directorio>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
+msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
 #, fuzzy
 msgid ""
 "Only process the packages that are selected for installation. The actual "
@@ -3151,13 +3139,13 @@ msgstr ""
 "Por ejemplo, si se borra uno, se marcará como elegido para desinstalar."
 
 # type: TP
-#: ../../man/dpkg.1:469
+#: ../../man/dpkg.1:475
 #, fuzzy, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, fuzzy
 msgid ""
 "Don't install the package if the same version of the package is already "
@@ -3167,13 +3155,13 @@ msgstr ""
 "instalada."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, fuzzy, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
@@ -3188,13 +3176,13 @@ msgstr ""
 "E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>»."
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -3208,41 +3196,41 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, fuzzy
 msgid "Configuration file with default options."
 msgstr "Fichero de configuración con las opciones por omisión."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, fuzzy
 msgid ""
 "The other files listed below are in their default directories, see option "
@@ -3253,25 +3241,25 @@ msgstr ""
 "ficheros."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, fuzzy
 msgid "List of available packages."
 msgstr "Lista de paquetes disponibles."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 #, fuzzy
 msgid ""
 "Statuses of available packages. This file contains information about whether "
@@ -3283,7 +3271,7 @@ msgstr ""
 "Véase el apartado B<INFORMACIÓN SOBRE PAQUETES> para más información."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, fuzzy
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
@@ -3293,55 +3281,55 @@ msgstr ""
 "(5) para más información sobre éstos:"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, fuzzy, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "VARIABLES DE ENTORNO"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, fuzzy
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
@@ -3352,25 +3340,25 @@ msgstr ""
 "intérprete de órdenes."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 #, fuzzy
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "El programa que ejecutará B<dpkg> cuando arranque el nuevo intérprete."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, fuzzy, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 #, fuzzy
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
@@ -3380,7 +3368,7 @@ msgstr ""
 "información. Por ahora sólo la usa la opción -l."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, fuzzy, no-wrap
@@ -3388,55 +3376,55 @@ msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Para listar los paquetes con «vi» en su nombre:"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, fuzzy, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 #, fuzzy
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Para ver las entradas en I</var/lib/dpkg/available> de varios paquetes:"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, fuzzy, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, fuzzy, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 #, fuzzy
 msgid "To remove an installed elvis package:"
 msgstr "Para borrar un paquete instalado llamado «elvis»:"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, fuzzy, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 #, fuzzy
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
@@ -3447,7 +3435,7 @@ msgstr ""
 "está en el apartado «editors»:"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3455,26 +3443,26 @@ msgid ""
 msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 #, fuzzy
 msgid "To make a local copy of the package selection states:"
 msgstr "Para hacer una copia local de los estados de la selección de paquetes:"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, fuzzy, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "B< dpkg --get-selections E<gt>mis_selecciones>"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 #, fuzzy
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr "Se podría copiar este fichero a otra máquina e instalarlo allí con:"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, fuzzy, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3482,13 +3470,13 @@ msgid ""
 msgstr "B< dpkg --set-selections E<lt>mis_selecciones>"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
 #, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Tenga en cuenta que esto no instalará ni borrará nada, simplemente "
 "modificará el estado de selección de los paquetes escogidos. Necesitará otra "
@@ -3496,7 +3484,7 @@ msgstr ""
 "B<dselect> y elija «Instalar»."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 #, fuzzy
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
@@ -3506,23 +3494,23 @@ msgstr ""
 "modificar los estados de selección de los paquetes."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, fuzzy, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "FUNCIONALIDAD ADICIONAL"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
 #, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "Se puede ganar funcionalidad adicional instalando alguno de los siguientes "
 "paquetes: I<apt>, I<aptitude> and I<debsums>."
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3531,24 +3519,24 @@ msgstr ""
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 #, fuzzy
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 "Normalmente, la opción B<--no-act> da menos información de la que necesita."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, fuzzy, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, fuzzy, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3564,6 +3552,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, no-wrap
+msgid "2007-03-06"
+msgstr ""
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4315,10 +4309,11 @@ msgstr "B<-b>"
 
 # type: Plain text
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
-msgstr ""
+"distributed."
+msgstr "Separa un paquete binario de Debian en varias partes."
 
 # type: TP
 #: ../../man/dpkg-buildpackage.1:19 ../../man/dpkg-checkbuilddeps.1:23
@@ -4334,7 +4329,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<-G>"
@@ -4346,30 +4341,30 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr "Separa un paquete binario de Debian en varias partes."
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 "Estas opciones controlan si el fichero de fuentes original se incluye en la "
 "subida generada por B<dpkg-buildpackage> y B<dpkg-genchanges> en caso de que "
 "se produzca alguna fuente (por ejemplo, si no se han usado B<-b> o B<-B>)."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 "Por omisión, o si se especifica B<-si>, el fichero de fuentes original se "
 "incluirá si el número de versión acaba en B<-0> o B<-1>, por ejemplo, si la "
@@ -4377,25 +4372,25 @@ msgstr ""
 "o B<1>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy
 msgid "Forces the inclusion of the original source."
 msgstr "B<-su> desempaqueta el archivo de fuentes original."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 #, fuzzy
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
@@ -4403,13 +4398,13 @@ msgstr ""
 "e incluye sólo el diff."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, fuzzy, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<-a>I<arquitectura>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 #, fuzzy
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
@@ -4422,14 +4417,14 @@ msgstr ""
 "máquina."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<versión>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 #, fuzzy
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
@@ -4439,13 +4434,13 @@ msgstr ""
 "estrictamente posteriores a I<versión .>"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, fuzzy, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B<-C>I<descripcióndecambios>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, fuzzy
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
@@ -4456,13 +4451,13 @@ msgstr ""
 "árbol de fuentes. Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, fuzzy, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr "B<-m>I<direcciónresponsable>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, fuzzy
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
@@ -4474,13 +4469,13 @@ msgstr ""
 "árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, fuzzy, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr "B<-e>I<direcciónresponsable>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 #, fuzzy
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
@@ -4492,13 +4487,13 @@ msgstr ""
 "árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
@@ -4506,25 +4501,25 @@ msgstr ""
 "es satisfecha."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 #, fuzzy
 msgid "Do not check build dependencies and conflicts."
 msgstr "No revisa dependencias ni conflictos."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<-W>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 #, fuzzy
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
@@ -4534,13 +4529,13 @@ msgstr ""
 "source>, pero B<dpkg-buildpackage> la reconoce y la pasa a B<dpkg-source>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
@@ -4550,25 +4545,25 @@ msgstr ""
 "source>, pero B<dpkg-buildpackage> la reconoce y la pasa a B<dpkg-source>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<-nc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr "No limpia las fuentes (implica -b)."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy, no-wrap
 msgid "B<-tc>"
 msgstr "B<-tc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, fuzzy
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
@@ -4578,14 +4573,14 @@ msgstr ""
 "clean>)  después de que el paquete se haya creado."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, fuzzy, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr "B<-r>I<orden-para-obtener-root>"
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, fuzzy
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
@@ -4608,13 +4603,13 @@ msgstr ""
 "caracteres especiales del intérprete de órdenes."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, fuzzy, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr "B<-p>I<orden-para-firmar>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, fuzzy
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
@@ -4634,75 +4629,68 @@ msgstr ""
 "espacios ni tampoco caracteres especiales del intérprete de órdenes."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, fuzzy, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr "B<-k>I<llave-id>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy
 msgid "Specify a key-ID to use when signing packages."
 msgstr "Especifica una llave-ID que se usa cuando se firman los paquetes."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy
 msgid "Do not sign the source package."
 msgstr "No firma el paquete ni el fichero .changes, respectivamente."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 #, fuzzy
 msgid "Do not sign the .changes file."
 msgstr "No firma el paquete ni el fichero .changes, respectivamente."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, fuzzy, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr "B<-i[E<lt>regexpE<gt>]>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 #, fuzzy
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr "Se pasa sin cambios a B<dpkg-source>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-n>I<nombrefichero>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 #, fuzzy
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 "Se pasa sin cambios a B<dpkg-source>.  Puede repetirse en varias ocasiones."
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, fuzzy, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir> I<directorio>"
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 #, fuzzy
 msgid ""
@@ -4713,8 +4701,8 @@ msgstr ""
 "información relativa a statoverride. Por omisión es /var/lib/dpkg."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4724,7 +4712,7 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-us>, B<-uc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 #, fuzzy
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
@@ -4735,7 +4723,7 @@ msgstr ""
 "root> y I<orden-para-firmar>."
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4803,7 +4791,7 @@ msgstr "B<-h>"
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
 #, fuzzy
-msgid "Copyright 2001 Joey Hess"
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4815,7 +4803,7 @@ msgstr "mailto:joeyh@debian.org"
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
 #, fuzzy
-msgid "E<lt>joeyh@debian.orgE<gt>."
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>"
 
 # type: TP
@@ -4868,7 +4856,7 @@ msgstr ""
 "lugar de ser relativo al directorio donde se ejecuta B<dpkg-distaddfile.>"
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4886,7 +4874,7 @@ msgstr ""
 "genchanges> y B<dpkg-distaddfile>."
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
 msgid "B<debian/files>"
@@ -5021,7 +5009,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<R archivo [ archivo-de-control ..]>"
 
 # type: Plain text
@@ -5072,7 +5060,7 @@ msgstr "Ofrece informaci
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
 #, fuzzy, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
 
 # type: Plain text
@@ -5205,7 +5193,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb --control> I<archivo directorio>"
 
 # type: Plain text
@@ -5401,20 +5389,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-#, fuzzy
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> y esta página de manual, fué escrita por Ian Jackson. Son "
-"Copyright (c) 1995-1996 suyos, y se distribuyen bajo la Licencia Publica de "
-"GNU.  No se ofrece NINGUNA garantía.  Consulte B</usr/share/doc/dpkg/"
-"copyright> y B</usr/share/common-licenses/GPL> para más información"
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -5444,8 +5418,8 @@ msgstr ""
 #: ../../man/dpkg-divert.8:23
 #, fuzzy
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5706,7 +5680,7 @@ msgstr "I</var/lib/dpkg/diversions>"
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 "Archivo que contiene la lista actual de redirecciones del sistema. Esta "
 "ubicado en el directorio de administración de dpkg, así como otros archivos "
@@ -5716,16 +5690,16 @@ msgstr ""
 #: ../../man/dpkg-divert.8:117
 #, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 "Nota: dpkg-divert preserva la copia antigua de este archivo, colocando la "
 "extensión \"-old\", antes de reemplazarlo con uno nuevo."
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
 #, fuzzy
-msgid "Copyright (C) 1995 Ian Jackson."
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
@@ -5758,67 +5732,49 @@ msgstr ""
 "desempaquetado y construido, así como de los ficheros que ha generado y crea "
 "un archivo de control de subida de Debian (fichero B<.changes> )."
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-#, fuzzy
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-"En B<dpkg-buildpackage>, B<dpkg-genchanges> y B<dpkg-parsechangelog> provoca "
-"que se use la información de los cambios de todas las versiones "
-"estrictamente posteriores a I<versión .>"
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-si>, B<-sa>, B<-sd>"
+msgid "B<-b>, B<-B>"
+msgstr "B<-b>|B<-B>|B<-S>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
-#, fuzzy
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
-"Estas opciones controlan si el fichero de fuentes original se incluye en la "
-"subida generada por B<dpkg-buildpackage> y B<dpkg-genchanges> en caso de que "
-"se produzca alguna fuente (por ejemplo, si no se han usado B<-b> o B<-B>)."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 #, fuzzy
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
-msgstr ""
-"Por omisión, o si se especifica B<-si>, el fichero de fuentes original se "
-"incluirá si el número de versión acaba en B<-0> o B<-1>, por ejemplo, si la "
-"parte del número de versión que corresponde a la revisión de Debian es B<0> "
-"o B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
+msgstr "Separa un paquete binario de Debian en varias partes."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 #, fuzzy
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
-"B<-sa> fuerza la inclusión de la fuente original; B<-sd> fuerza su exclusión "
-"e incluye sólo el diff."
+"En B<dpkg-buildpackage>, B<dpkg-genchanges> y B<dpkg-parsechangelog> provoca "
+"que se use la información de los cambios de todas las versiones "
+"estrictamente posteriores a I<versión .>"
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, fuzzy, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nombre>B<=>I<valor>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 #, fuzzy
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
@@ -5829,14 +5785,14 @@ msgstr ""
 "exposición sobre la sustitución de salida."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<fichvarsust>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5844,70 +5800,40 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<campo>B<=>I<valor>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<campo>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-b>|B<-B>|B<-S>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-#, fuzzy
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-"Para B<dpkg-genchanges> y B<dpkg-buildpackage>, B<-b> y B<-B> especifica que "
-"van a producirse únicamente binarios.  B<-b> indica que no se construya y/o "
-"distribuya ningún fichero fuente y B<-B> que tampoco se distribuya ningún "
-"fichero del paquete binario independiente de la arquitectura.  B<-S> "
-"especifica que sólo debería subirse la fuente y que no es necesario "
-"construir ningún paquete binario. La diferencia entre B<-b> y B<-B> es usada "
-"sólo por B<dpkg-buildpackage>; B<dpkg-genchanges> sólo produce un archivo B<."
-"changes> para todos aquellos ficheros generados por los objetivos B<binary-"
-"*> del paquete en construcción."
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<ficherocontrol>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #, fuzzy
 msgid ""
 "Specifies the main source control file to read information from. The default "
@@ -5918,14 +5844,14 @@ msgstr ""
 "por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, fuzzy, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<ficherocambios>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 #, fuzzy
 msgid ""
@@ -5937,7 +5863,7 @@ msgstr ""
 "gencontrol> y B<dpkg-genchanges>."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 #, fuzzy
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
@@ -5948,14 +5874,14 @@ msgstr ""
 "genchanges> y B<dpkg-distaddfile>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, fuzzy, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<formatocambios>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 #, fuzzy
 msgid ""
@@ -5971,13 +5897,13 @@ msgstr ""
 "genchanges>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, fuzzy, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr "B<-u>I<directoriosubidaficheros>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
@@ -5989,13 +5915,13 @@ msgstr ""
 "sus tamaños y sumas de verificación en el fichero B<.changes>)."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 #, fuzzy
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
@@ -6007,7 +5933,7 @@ msgstr ""
 "fuente de los paquetes se están subiendo.  B<-q> suprime dichos mensajes."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 #, fuzzy
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
@@ -6025,6 +5951,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "deb-control"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, no-wrap
+msgid "2007-06-12"
+msgstr ""
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -6418,16 +6351,10 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
+#: ../../man/dpkg-name.1:107
 #, fuzzy
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
-"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
-"condiciones de copia.  B<No> hay garantía alguna."
+msgid "Copyright 1995,1996 Erick Branderhorst"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -6517,7 +6444,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
@@ -6549,7 +6476,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
@@ -6565,7 +6492,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-a>|B<--startas> I<pathname>"
 
 # type: Plain text
@@ -6578,20 +6505,20 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
 
 # type: Plain text
@@ -6605,7 +6532,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-n>|B<--name> I<nombre-proceso>"
 
 # type: Plain text
@@ -6718,8 +6645,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:151
 #, fuzzy
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
+msgid "Copyright (C) 2001 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: UR
 #: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83
@@ -7488,21 +7415,45 @@ msgstr ""
 "genere el fichero .tar.gz. La opción puede ser repetida varias ocasiones "
 "para permitir la expulsión de varios nombres de fichero."
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
+#, no-wrap
+msgid "B<Build options (with -b):>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/dpkg-source.1:148
+#, fuzzy
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
+msgstr ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> y B<-sr> no sobreescriben directorios o "
+"ficheros tar existentes. Si esto es lo que se desea, debe utilizar B<-sA>, "
+"B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
+
+# type: TP
+#: ../../man/dpkg-source.1:148
 #, fuzzy, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>"
+msgid "B<-sk>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:154
 #, fuzzy
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 "Si se especifican B<-sk> o B<-sp>, B<dpkg-source> espera la fuente original "
 "como un archivo tar, por omisión I<paquete>B<_>I<versióndesarrolladorppal>B<."
@@ -7510,29 +7461,61 @@ msgstr ""
 "o será copiada al directorio actual en caso de no estar ya ahí presente.  Si "
 "se usa B<-sp> en lugar de B<-sk>, se eliminará de nuevo posteriormente."
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "I<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "I<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:167
 #, fuzzy
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
 msgstr ""
 "Si se especifican B<-su> o B<-sr>, se espera que la fuente original sea un "
 "directorio, por omisión I<paquete>B<->I<versióndeldesarrolladorppal>B<.orig> "
 "y B<dpkg-source> creará un fichero de fuentes nuevo a partir de él. Si se "
 "usa B<-sr ,> B<dpkg-source eliminará dicho directorio tras la operación .>"
 
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "I<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "I<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:180
 #, fuzzy
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 "Si se especifica B<-ss>, B<dpkg-source> esperará que la fuente original esté "
 "disponible tanto como directorio como fichero tar. Usará el directorio para "
@@ -7540,14 +7523,20 @@ msgstr ""
 "usarse con precaución - si el directorio y el archivo tar no coinciden se "
 "generará un fichero fuente inválido."
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "I<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:186
 #, fuzzy
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 "Si se especifica B<-sn>, B<dpkg-source> no buscará ninguna fuente original y "
 "no generará un diff. El segundo argumento, en caso de haberlo, debe ser la "
@@ -7555,22 +7544,27 @@ msgstr ""
 "tienen fuentes del desarrollador principal y por tanto carecen de diffs "
 "\"debianizantes\"."
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--split>, B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:212
 #, fuzzy
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 "Si se especifican B<-sa> o B<-sA>, B<dpkg-source> buscará la fuente original "
 "como directorio o como fichero tar - el segundo argumento, de haberlo, puede "
@@ -7585,38 +7579,26 @@ msgstr ""
 "(equivalente a B<-sP>), o ocurrirá un error si se especificó B<-sa>.  B<-sA> "
 "es la opción predeterminada."
 
-# type: Plain text
-#: ../../man/dpkg-source.1:217
-#, fuzzy
-msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
-msgstr ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> y B<-sr> no sobreescriben directorios o "
-"ficheros tar existentes. Si esto es lo que se desea, debe utilizar B<-sA>, "
-"B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
-
 # type: TP
-#: ../../man/dpkg-source.1:217
-#, fuzzy, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr "B<-sp>,B<-su>,B<-sn> con B<-x>"
+#: ../../man/dpkg-source.1:212
+#, no-wrap
+msgid "B<Extract options (with -x):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 #, fuzzy
 msgid "In all cases any existing original source tree will be removed."
 msgstr "En todos los casos cualquier árbol de fuentes original será eliminado."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 #, fuzzy
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 "Si se usa B<-sp> a la hora de extraer, la fuente original (si la hay) se "
 "dejará como un fichero tar. Si no se encuentra en el directorio actual o si "
@@ -7624,32 +7606,25 @@ msgstr ""
 "omisión."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
+#: ../../man/dpkg-source.1:225
 #, fuzzy
-msgid "B<-su> unpacks the original source tree."
+msgid "Unpacks the original source tree."
 msgstr "B<-su> desempaqueta el archivo de fuentes original."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
+#: ../../man/dpkg-source.1:230
 #, fuzzy
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 "B<-sn> se asegura de que la fuente original ni se copia al directorio actual "
 "ni se desempaqueta. Cualquier árbol de fuentes original existente en el "
 "directorio actual es eliminado."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
-msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 #, fuzzy
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
@@ -7662,7 +7637,7 @@ msgstr ""
 "versión."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
@@ -8182,20 +8157,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(8)"
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-#, fuzzy
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-split> Esta página de manual fue escrita por Ian Jackson. Es "
-"Copyright (C) 1995-1996 del mismo y liberada bajo la Licencia Pública "
-"General de GNU, NO hay ninguna garantía. Vea B</usr/share/dpkg/copyright> y "
-"B</usr/share/common-licenses/GPL> para más información."
-
 # type: TP
 #: ../../man/dpkg-statoverride.8:1
 #, fuzzy, no-wrap
@@ -8386,12 +8347,6 @@ msgstr ""
 "Nota: dpkg-statoverride preserva una copia antigua del fichero con la "
 "extensión \"-old\" antes de reemplazarla con una nueva."
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-#, fuzzy
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
 # type: SS
 #: ../../man/dselect.1:1
 #, fuzzy, no-wrap
@@ -10085,16 +10040,10 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/install-info.8:297
+#: ../../man/install-info.8:293
 #, fuzzy
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
-"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
-"condiciones de copia.  B<No> hay garantía alguna."
+msgid "Copyright 1994 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -10990,7 +10939,7 @@ msgstr ""
 # type: TP
 #: ../../man/update-alternatives.8:204
 #, fuzzy, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<gen enlace alt pri> [B<--slave> I<sgen senlace salt>] ..."
 
 # type: Plain text
@@ -11399,38 +11348,19 @@ msgstr ""
 "implementación o bien en la documentación, por favor, avise."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-#, fuzzy
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-msgstr ""
-"Update-alternatives de Debian es copyright 1995 de Ian Jackson. Es un "
-"programa libre, vea la licencia GPL de GNU versión 2 o posterior para las "
-"condiciones de copia. NO hay ninguna garantía."
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-#, fuzzy
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Esta página del manual es copyright 1997/98 de Charles Briscoe-Smith.  Es "
-"documentación libre, vea la licencia GPL de GNU versión 2 o posterior para "
-"las condiciones de copia.  NO hay ninguna garantía."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
 #, fuzzy
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Puede encontrar la licencia GPL de GNU en /usr/share/common-licenses/GPL en "
-"cualquier sistema Debian."
+"Esto es software libre; vea la versión 2 o posterior de la Licencia Pública "
+"General GNU para condiciones de copia.  NO hay ninguna garantía."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:405
@@ -11438,6 +11368,216 @@ msgstr ""
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, el estándar sobre la jerarquía del sistema de ficheros."
 
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Esto es software libre; vea la versión 2 o posterior de la Licencia "
+#~ "Pública General GNU para condiciones de copia.  NO hay ninguna garantía."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "The utilities and this manpage were written by Ian Jackson."
+#~ msgstr ""
+#~ "Las herramientas y esta página del manual fueron escritas por Ian Jackson."
+
+# type: SH
+#, fuzzy
+#~ msgid "COPYRIGHT"
+#~ msgstr "COPYRIGHT"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "These options control whether the original source archive is included in "
+#~ "the upload generated by B<dpkg-buildpackage> if any source is being "
+#~ "generated (i.e., B<-b> or B<-B> haven't been used)."
+#~ msgstr ""
+#~ "Estas opciones controlan si el fichero de fuentes original se incluye en "
+#~ "la subida generada por B<dpkg-buildpackage> y B<dpkg-genchanges> en caso "
+#~ "de que se produzca alguna fuente (por ejemplo, si no se han usado B<-b> o "
+#~ "B<-B>)."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Include the original source if the version number ends in B<-0> or B<-1>, "
+#~ "i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
+#~ "B<This is the default.>"
+#~ msgstr ""
+#~ "Por omisión, o si se especifica B<-si>, el fichero de fuentes original se "
+#~ "incluirá si el número de versión acaba en B<-0> o B<-1>, por ejemplo, si "
+#~ "la parte del número de versión que corresponde a la revisión de Debian es "
+#~ "B<0> o B<1>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> y esta página de manual, fué escrita por Ian Jackson. Son "
+#~ "Copyright (c) 1995-1996 suyos, y se distribuyen bajo la Licencia Publica "
+#~ "de GNU.  No se ofrece NINGUNA garantía.  Consulte B</usr/share/doc/dpkg/"
+#~ "copyright> y B</usr/share/common-licenses/GPL> para más información"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<-si>, B<-sa>, B<-sd>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+#~ "exclusion and includes only the diff."
+#~ msgstr ""
+#~ "B<-sa> fuerza la inclusión de la fuente original; B<-sd> fuerza su "
+#~ "exclusión e incluye sólo el diff."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify "
+#~ "that a binary-only build is taking place.  B<-b> indicates that no source "
+#~ "files are to be built and/or distributed, and B<-B> that no architecture-"
+#~ "independent binary package files are to be distributed either.  B<-S> "
+#~ "specifies that only the source should be uploaded and no binary packages "
+#~ "need to be made. The distinction between B<-b> and B<-B> is only used by "
+#~ "B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+#~ "for whatever files were produced by the B<binary-*> target(s) of the "
+#~ "package being built."
+#~ msgstr ""
+#~ "Para B<dpkg-genchanges> y B<dpkg-buildpackage>, B<-b> y B<-B> especifica "
+#~ "que van a producirse únicamente binarios.  B<-b> indica que no se "
+#~ "construya y/o distribuya ningún fichero fuente y B<-B> que tampoco se "
+#~ "distribuya ningún fichero del paquete binario independiente de la "
+#~ "arquitectura.  B<-S> especifica que sólo debería subirse la fuente y que "
+#~ "no es necesario construir ningún paquete binario. La diferencia entre B<-"
+#~ "b> y B<-B> es usada sólo por B<dpkg-buildpackage>; B<dpkg-genchanges> "
+#~ "sólo produce un archivo B<.changes> para todos aquellos ficheros "
+#~ "generados por los objetivos B<binary-*> del paquete en construcción."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software "
+#~ "gratuito; Vea la Licencia Pública General de GNU en su versión 2 o "
+#~ "superior para las condiciones de copia.  B<No> hay garantía alguna."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+#~ msgstr "B<-sp>,B<-su>,B<-sn> con B<-x>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-split> Esta página de manual fue escrita por Ian Jackson. Es "
+#~ "Copyright (C) 1995-1996 del mismo y liberada bajo la Licencia Pública "
+#~ "General de GNU, NO hay ninguna garantía. Vea B</usr/share/dpkg/copyright> "
+#~ "y B</usr/share/common-licenses/GPL> para más información."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software "
+#~ "gratuito; Vea la Licencia Pública General de GNU en su versión 2 o "
+#~ "superior para las condiciones de copia.  B<No> hay garantía alguna."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Update-alternatives de Debian es copyright 1995 de Ian Jackson. Es un "
+#~ "programa libre, vea la licencia GPL de GNU versión 2 o posterior para las "
+#~ "condiciones de copia. NO hay ninguna garantía."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Esta página del manual es copyright 1997/98 de Charles Briscoe-Smith.  Es "
+#~ "documentación libre, vea la licencia GPL de GNU versión 2 o posterior "
+#~ "para las condiciones de copia.  NO hay ninguna garantía."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "Puede encontrar la licencia GPL de GNU en /usr/share/common-licenses/GPL "
+#~ "en cualquier sistema Debian."
+
 # type: Plain text
 #, fuzzy
 #~ msgid ""
@@ -11915,11 +12055,6 @@ msgstr "B<ln>(1), FHS, el est
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--split>, B<-s>"
-
 # type: TP
 #, fuzzy
 #~ msgid "B<--join>, B<-j>"
diff --git a/man/po/fr.po b/man/po/fr.po
index f65ffcc8..0e267f44 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2007-05-17 03:10+0200\n"
 "Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -152,7 +152,7 @@ msgstr ""
 "même fonctionnalité grâce à son option B<-R>."
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -175,9 +175,9 @@ msgstr "B<822-date> ne prend aucun param
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -193,15 +193,16 @@ msgstr "Cette fonctionnalit
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -218,9 +219,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
@@ -247,12 +249,16 @@ msgid "cleanup-info"
 msgstr "cleanup-info"
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
-#, no-wrap
-msgid "2007-03-06"
-msgstr "06-03-2007"
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-07-18"
+msgstr "15-05-2007"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -330,19 +336,20 @@ msgstr ""
 "\\ !>\""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -353,25 +360,25 @@ msgid "Show the usage message and exit."
 msgstr "Affiche un message d'aide puis quitte."
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -382,13 +389,12 @@ msgstr "Affiche le num
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -420,16 +426,23 @@ msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+#, fuzzy
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Ce programme est un logiciel libre\\ ; voyez la «\\ GNU General Public "
 "Licence\\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
@@ -1338,19 +1351,6 @@ msgstr "B<dpkg-shlibdeps>(1)."
 msgid "deb-substvars"
 msgstr "deb-substvars"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "12-05-2007"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1634,7 +1634,7 @@ msgid "List of substitution variables and values."
 msgstr "La liste des variables de substitution et leurs valeurs."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1653,46 +1653,23 @@ msgstr ""
 "(1), B<dpkg-source>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr "Ces outils et cette page de manuel ont été écrits par Ian Jackson."
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright (C) 2000 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Ce programme est un logiciel libre\\ ; voyez la «\\ GNU General Public "
-"Licence\\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
-"garantie."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1993,8 +1970,8 @@ msgstr "ACTIONS"
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<fichier-paquet>..."
 
 # type: Plain text
@@ -2064,8 +2041,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<fichier-paquet> ..."
 
 # type: Plain text
@@ -2079,8 +2056,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<paquet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2115,8 +2092,8 @@ msgstr "B<2.> Ex
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paquet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2162,8 +2139,8 @@ msgstr "B<3.> lancement du script I<postrm>"
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<fichier-Packages>"
 
 # type: Plain text
@@ -2195,8 +2172,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<fichier-paquet> ..."
 
 # type: Plain text
@@ -2213,8 +2190,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2224,8 +2201,8 @@ msgstr "Oublie ce qui concerne les paquets non install
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2235,9 +2212,9 @@ msgstr "Efface les renseignements existants sur les paquets disponibles."
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>, B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2250,8 +2227,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<paquet-nom-motif>...]"
 
 # type: Plain text
@@ -2266,8 +2243,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2286,8 +2263,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
@@ -2303,8 +2280,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2318,8 +2295,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2331,8 +2308,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2360,14 +2337,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2377,12 +2355,6 @@ msgstr ""
 "redéfinies pour les commandes suivantes qui sont exécutées pendant la même "
 "séquence."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2390,8 +2362,8 @@ msgstr "Affiche un court message d'aide."
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2401,9 +2373,9 @@ msgstr "Donne des renseignements sur les options B<--force->I<quelque-chose>."
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<-D>, B<--debug>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2412,21 +2384,15 @@ msgstr "donne des renseignements sur les options de d
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr "Affiche la licence de B<dpkg>."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2447,26 +2413,26 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<répertoire> [I<nom-de-fichier>]\n"
 "    Construit un paquet deb.\n"
@@ -2499,19 +2465,20 @@ msgstr ""
 "suivantes."
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<paquet-nom-motif> ...\n"
 "    Affiche la liste des paquets qui correspondent au motif.\n"
@@ -2527,7 +2494,7 @@ msgstr ""
 "    à propos de I<paquet>.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2540,26 +2507,26 @@ msgstr ""
 "mais sans tiret), soit un commentaire, commençant par B<#>."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<nombre>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Modifie le nombre d'erreurs au delà duquel B<dpkg> s'arrête. il est par "
 "défaut égal à 50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2571,13 +2538,13 @@ msgstr ""
 "déconfiguration automatique du paquet qui dépendait du paquet supprimé."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2589,7 +2556,7 @@ msgstr ""
 "debug=help> affiche ces valeurs de débogage."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2622,13 +2589,13 @@ msgstr ""
 " 2000   Quantité stupide de radotage\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<quelque-chose> | B<--no-force->I<quelque-chose> | B<--refuse->I<quelque-chose>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2641,7 +2608,7 @@ msgstr ""
 "décrit. Les actions marquées d'un (*) sont forcées par défaut."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2652,12 +2619,12 @@ msgstr ""
 "le système entier.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>\\ : Met en oeuvre (ou pas) toutes les options de forçage."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2666,7 +2633,7 @@ msgstr ""
 "paquet est déjà installée."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2682,7 +2649,7 @@ msgstr ""
 "rendre votre système inutilisable. N'utiliser qu'avec précaution.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2691,12 +2658,12 @@ msgstr ""
 "configurés dont dépend le paquet en question."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>\\ : Traite même les paquets marqués « à garder » (« hold »)."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2707,7 +2674,7 @@ msgstr ""
 "paquet restent dans le système et soient oubliés par B<dpkg>."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2719,20 +2686,20 @@ msgstr ""
 "utiliser cette option avec prudence."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 "B<depends>\\ : Change tous les problèmes de dépendance en avertissements."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>\\ : Ignore les versions dans les questions de dépendance."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2742,7 +2709,7 @@ msgstr ""
 "certains fichiers."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2752,7 +2719,7 @@ msgstr ""
 "seront pas préservés (suppression)."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2763,7 +2730,7 @@ msgstr ""
 "est aussi présente, auquel cas l'action par défaut est choisie."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2774,7 +2741,7 @@ msgstr ""
 "présente, auquel cas l'action par défaut est choisie."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2788,19 +2755,19 @@ msgstr ""
 "ces options pour déterminer ce qu'il faut faire."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite>\\ : Remplace un fichier par un fichier d'un autre paquet."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>\\ : Remplace un répertoire par un répertoire d'un autre "
 "paquet."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2808,12 +2775,12 @@ msgstr ""
 "détournée."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>\\ : Traite même les paquets d'une autre architecture"
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2821,25 +2788,25 @@ msgstr ""
 "ce qui va poser des problèmes."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root>\\ : Tente de (dés)installer même sans être root."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>\\ : Installe un paquet même si la vérification de son "
 "authenticité a échoué."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paquet>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2849,13 +2816,13 @@ msgstr ""
 "que des avertissements)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2863,13 +2830,13 @@ msgstr ""
 "une option de B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2878,13 +2845,13 @@ msgstr ""
 "construction d'un paquet. C'est une option de B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2895,7 +2862,7 @@ msgstr ""
 "soit."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2908,13 +2875,13 @@ msgstr ""
 "le paquet --no-act, même si vous comptiez qu'elle ne ferait rien du tout."
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2926,13 +2893,13 @@ msgstr ""
 "install>, B<--unpack> et B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
@@ -2941,22 +2908,35 @@ msgstr ""
 "installée. C'est un alias pour B<--refuse-downgrade>."
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<rep> | B<--admindir=>I<rep> | B<--instdir=>I<rep>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir>=I<dir>"
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir>=I<dir>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
+#, fuzzy
+msgid ""
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Change les répertoires par défaut. B<admindir> est par défaut I</var/lib/"
 "dpkg> et contient beaucoup de fichiers qui donnent des informations sur "
@@ -2968,14 +2948,27 @@ msgstr ""
 "B<root> change B<instdir> en I<rep> et B<admindir> en I<rep>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir>=I<dir>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2987,13 +2980,13 @@ msgstr ""
 "marqué comme ayant été sélectionné pour une désinstallation."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -3001,13 +2994,13 @@ msgstr ""
 "Ne pas installer le paquet si la même version du paquet est déjà installée."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -3025,13 +3018,13 @@ msgstr ""
 "conffile : 'current-conffile' 'new-conffile' useredited distedited"
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<fichier>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -3057,42 +3050,42 @@ msgstr ""
 "soit keep."
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "Ne pas tenter de vérifier la signature des paquets."
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Fichier de configuration contenant les options par défaut."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "Fichier journal standard. Voyez I</etc/dpkg/dpkg.cfg>(5) et l'option  B<--"
 "log>."
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -3102,24 +3095,24 @@ msgstr ""
 "fichiers."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Liste des paquets disponibles."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -3131,7 +3124,7 @@ msgstr ""
 "LES PAQUETS> pour des informations supplémentaires."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -3140,55 +3133,55 @@ msgstr ""
 "des informations supplémentaires :"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3198,26 +3191,26 @@ msgstr ""
 "l'interpréteur de commandes."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "Le programme exécuté par B<dpkg> quand il lance un nouvel interpréteur de "
 "commandes."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3226,7 +3219,7 @@ msgstr ""
 "formaté. Seule l'action B<-l> se sert actuellement de cette variable."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3234,53 +3227,53 @@ msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Pour afficher les paquets liés au programme B<vi>(1) :"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "    B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Pour voir les entrées de I</var/lib/dpkg/available> concernant deux paquets"
 "\\ :"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "    B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "Pour rechercher vous-même dans la liste des paquets\\ :"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "    B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "Pour supprimer le paquet installé elvis\\ :"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "    B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3290,7 +3283,7 @@ msgstr ""
 "trouve dans la section «\\ editors\\ » :"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3300,18 +3293,18 @@ msgstr ""
 "    B< dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "Pour faire une copie locale des états de sélection des paquets :"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "    B<dpkg --get-selections E<gt>myselections>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3319,7 +3312,7 @@ msgstr ""
 "de cette manière :"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3329,12 +3322,13 @@ msgstr ""
 "    B<dpkg --set-selections E<lt>myselections>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "On remarquera que cela n'installe ou ne supprime rien du tout\\ ; cela ne "
 "fait que déterminer l'état de sélection des paquets. Vous aurez besoin "
@@ -3342,7 +3336,7 @@ msgstr ""
 "requis. Par exemple, exécutez B<dselect> et choisissez Install."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3351,22 +3345,23 @@ msgstr ""
 "aisée de modifier les états de sélection des paquets."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "FONCTIONNALITÉS SUPPLÉMENTAIRES"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "D'autres possibilités sont offertes en installant les paquets suivants\\ : "
 "I<apt>, I<aptitude> et I<debsums>."
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3375,22 +3370,22 @@ msgstr ""
 "(5), B<dpkg.cfg>(5) et B<dpkg-reconfigure>(8)"
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "L'option B<--no-act> ne donne pas assez d'informations utiles."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3405,6 +3400,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, no-wrap
+msgid "2007-03-06"
+msgstr "06-03-2007"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4280,9 +4281,10 @@ msgstr "B<-b>"
 # NOTE: and en trop ?
 # type: Plain text
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 "Indique que seul un paquet binaire est à construire ; aucun fichier source "
 "n'est à construire ou à distribuer."
@@ -4304,7 +4306,7 @@ msgstr ""
 "distribuer."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, no-wrap
 msgid "B<-S>"
 msgstr "B<-S>"
@@ -4316,65 +4318,68 @@ msgstr ""
 "Ne construit qu'un paquet source, aucun paquet binaire ne sera construit."
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
+#, fuzzy
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 "Ces options contrôlent si l'archive source originale est incluse dans "
-"l'installation produite par B<dpkg-buildpackage> quand on construit un "
-"paquet source (les options B<-b> or B<-B> n'ont pas été utilisées)."
+"l'installation produite par B<dpkg-genchanges> quand on construit un paquet "
+"source (les options B<-b> or B<-B> n'ont pas été utilisées)."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, no-wrap
 msgid "B<-si>"
 msgstr "B<-si>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
+#, fuzzy
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
-"Inclure les sources originales si le numéro de version se termine par B<-0> "
-"ou B<-1>, c'est-à-dire si la partie «\\ révision Debian\\ » du numéro de "
-"version est égal à B<0> ou B<1>. B<C'est le comportement par défaut.>"
+"Par défaut, ou quand l'option B<-si> est indiquée, les sources originales "
+"sont incluses si le numéro de version se termine par B<-0> ou B<-1>, c'est-à-"
+"dire si la partie «\\ révision Debian\\ » du numéro de version est égal à "
+"B<0> ou B<1>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, no-wrap
 msgid "B<-sa>"
 msgstr "B<-sa>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr "Force l'inclusion des sources originelles."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, no-wrap
 msgid "B<-sd>"
 msgstr "B<-sd>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 "Force l'exclusion des sources originelles et inclut seulement le «\\ diff\\ "
 "»."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<-a>I<architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4385,14 +4390,14 @@ msgstr ""
 "c'est aussi l'architecture par défaut de la machine hôte."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
@@ -4400,13 +4405,13 @@ msgstr ""
 "concernent toutes les versions strictement plus récentes que I<version>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B<-C>I<description-des-changements>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
@@ -4416,13 +4421,13 @@ msgstr ""
 "source."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr "B<-m>I<adresse-du-responsable>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4433,13 +4438,13 @@ msgstr ""
 "le fichier «\\ control\\ » de l'arborescence source."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr "B<-e>I<adresse-du-responsable>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4451,37 +4456,37 @@ msgstr ""
 "source."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 "Vérifier les dépendances de constructions et les conflits\\ ; se termine en "
 "cas de problèmes."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr "Ne pas vérifier les dépendances de constructions et les conflits."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, no-wrap
 msgid "B<-W>"
 msgstr "B<-W>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 #, fuzzy
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
@@ -4491,13 +4496,13 @@ msgstr ""
 "mais B<dpkg-buildpackage> la reconnait et la transmet à B<dpkg-source>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
@@ -4507,24 +4512,24 @@ msgstr ""
 "mais B<dpkg-buildpackage> la reconnait et la transmet à B<dpkg-source>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, no-wrap
 msgid "B<-nc>"
 msgstr "B<-nc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr "Ne pas nettoyer l'arborescence source (implique l'option B<-b>)."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, no-wrap
 msgid "B<-tc>"
 msgstr "B<-tc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
@@ -4533,14 +4538,14 @@ msgstr ""
 "de-root> B<debian/rules clean>)  après la construction du paquet."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr "B<-r>I<commande-pour-obtenir-privilèges-de-root>"
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4568,13 +4573,13 @@ msgstr ""
 "doit être exécutée."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr "B<-p>I<commande-de-signature>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4594,70 +4599,63 @@ msgstr ""
 "l'interpréteur de commandes."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr "B<-k>I<key-id>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr "Précise une clé pour la signature des paquets."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, no-wrap
 msgid "B<-us>"
 msgstr "B<-us>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr "Ne pas signer le paquet source."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, no-wrap
 msgid "B<-uc>"
 msgstr "B<-uc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr "Ne pas signer le fichier «\\ .changes\\ »."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr "B<-i>[I<regexp>]"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr "Chaîne passée telle quelle à B<dpkg-source.>"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<nom-de-fichier>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 "Fichier passé tel quel à B<dpkg-source.> Peut être plusieurs fois répétée."
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir>=I<dir>"
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4667,8 +4665,8 @@ msgstr ""
 "c'est I</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4678,7 +4676,7 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
@@ -4688,7 +4686,7 @@ msgstr ""
 "I<commande-de-signature>."
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
 "(1), B<pgp>(1)."
@@ -4752,7 +4750,8 @@ msgstr "B<-h>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+#, fuzzy
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4763,7 +4762,8 @@ msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TP
@@ -4809,7 +4809,7 @@ msgstr ""
 "que relativement au répertoire dans lequel est exécuté B<dpkg-distaddfile.>"
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4825,7 +4825,7 @@ msgstr ""
 "dans ce fichier plutôt que dans le fichier B<debian/files>."
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
@@ -4951,8 +4951,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
-#, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<archive> [I<fichier-control> ...]"
 
 # type: Plain text
@@ -5002,8 +5002,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
-#, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<archive> [I<champ-control> ...]"
 
 # type: Plain text
@@ -5122,8 +5122,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
-#, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B< --control> I<archive répertoire>"
 
 # type: Plain text
@@ -5321,20 +5321,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> et cette page de manuel ont été écrits par Ian Jackson. Le "
-"copyright (C) date de 1995-1996 et ils ont paru sous la licence «\\ GNU "
-"General Public Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de "
-"garantie. Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-"
-"licenses/GPL> pour des précisions."
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -5362,9 +5348,10 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
+#, fuzzy
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5625,10 +5612,11 @@ msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:114
+#, fuzzy
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 "Ce fichier contient la liste des détournements en oeuvre sur le système. Il "
 "se trouve dans le répertoire d'administration de dpkg, avec d'autres "
@@ -5636,16 +5624,18 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 "Note : B<dpkg-divert> préserve l'ancienne copie de ce fichier, avec "
 "l'extension «\\ -old\\ », avant de la remplacer par la nouvelle."
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+#, fuzzy
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
@@ -5676,63 +5666,49 @@ msgstr ""
 "\\ ; puis il crée un fichier de contrôle pour la mise en place dans "
 "l'archive Debian (c'est le fichier B<.changes>)."
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-"Force l'utilisation des informations contenues dans le fichier «\\ changelog"
-"\\ » et qui concernent toutes les versions strictement plus récentes que "
-"I<version>."
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-si>, B<-sa>, B<-sd>"
+#: ../../man/dpkg-genchanges.1:18
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>"
+msgstr "B<-b>, B<-B>, B<-S>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
-"Ces options contrôlent si l'archive source originale est incluse dans "
-"l'installation produite par B<dpkg-genchanges> quand on construit un paquet "
-"source (les options B<-b> or B<-B> n'ont pas été utilisées)."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
+#, fuzzy
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
-"Par défaut, ou quand l'option B<-si> est indiquée, les sources originales "
-"sont incluses si le numéro de version se termine par B<-0> ou B<-1>, c'est-à-"
-"dire si la partie «\\ révision Debian\\ » du numéro de version est égal à "
-"B<0> ou B<1>."
+"Ne construit qu'un paquet source, aucun paquet binaire ne sera construit."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
-"L'option B<-sa> force l'inclusion des sources originales\\ ; l'option B<-sd> "
-"force leur exclusion et inclut seulement le «\\ diff_ »."
+"Force l'utilisation des informations contenues dans le fichier «\\ changelog"
+"\\ » et qui concernent toutes les versions strictement plus récentes que "
+"I<version>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nom>B<=>I<valeur>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 #, fuzzy
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
@@ -5742,14 +5718,14 @@ msgstr ""
 "(5) pour une discussion sur la valeur de substitution."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<fichier/substvars>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5759,70 +5735,40 @@ msgstr ""
 "par défaut est B<debian/substvars>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<champ>B<=>I<valeur>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr "Remplace ou ajoute en sortie un champ dans le fichier de contrôle."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<champ>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr "Supprime en sortie un champ dans le fichier de contrôle."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-b>, B<-B>, B<-S>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-"Avec B<dpkg-genchanges> et B<dpkg-buildpackage> les options B<-b> et B<-B> "
-"indiquent qu'on veut seulement construire un paquet binaire. L'option B<-b> "
-"indique qu'aucun fichier source n'est à construire ou à distribuer, et "
-"l'option B<-B> indique en plus qu'aucun fichier, appartenant à un paquet "
-"binaire ne dépendant pas d'une architecture, n'est à distribuer. L'option B<-"
-"S> indique que seul le source doit être installé et qu'on a pas besoin de "
-"construire un paquet binaire. Seul B<dpkg-buildpackage> se sert des options "
-"B<-b> et B<-B>. B<dpkg-genchanges> crée seulement un fichier B<.changes> "
-"pour tous les fichiers produits par la cible B<binary-*> du paquet qui est "
-"construit."
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<fichier/control>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
@@ -5831,14 +5777,14 @@ msgstr ""
 "renseignements. Par défaut, c'est le fichier B<debian/control>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<fichier/changelog>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5848,7 +5794,7 @@ msgstr ""
 "renseignements. Par défaut, c'est le fichier B<debian/changelog>."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
@@ -5857,14 +5803,14 @@ msgstr ""
 "dans ce fichier plutôt que dans le fichier B<debian/files>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<format-du-changelog>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5876,13 +5822,13 @@ msgstr ""
 "classique B<debian>."
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr "B<-u>I<répertoire-des-fichiers-à-installer>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5894,13 +5840,13 @@ msgstr ""
 "B<.changes.)>"
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5911,7 +5857,7 @@ msgstr ""
 "paquet sont en cours d'installation. B<-q> supprime ces messages."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5926,6 +5872,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "dpkg-gencontrol"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "12-05-2007"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -6303,15 +6256,10 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> est un logiciel libre"
-"\\ ; voyez la «\\ GNU General Public Licence\\ » version 2 ou supérieure "
-"pour le copyright. Il n'y a B<pas> de garantie."
+#: ../../man/dpkg-name.1:107
+#, fuzzy
+msgid "Copyright 1995,1996 Erick Branderhorst"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -6398,8 +6346,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:14
-#, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<-l>, B<--list> I<nom-paquet-motif> ..."
 
 # type: Plain text
@@ -6442,8 +6390,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:33
-#, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<-W>, B<--show> I<nom-paquet-motif> ..."
 
 # type: Plain text
@@ -6463,8 +6411,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:40
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-s>, B<--status> I<nom-paquet> ..."
 
 # type: Plain text
@@ -6478,14 +6426,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:44
-#, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<paquet> ..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 "Affiche la liste des fichiers de I<paquet> installés sur le système. Il faut "
@@ -6494,8 +6443,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
-#, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<motif-de-recherche> ..."
 
 # type: Plain text
@@ -6512,8 +6461,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:55
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<paquet>"
 
 # type: Plain text
@@ -6673,8 +6622,9 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
+#, fuzzy
+msgid "Copyright (C) 2001 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: UR
 #: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83
@@ -7426,20 +7376,47 @@ msgstr ""
 "tar sautera les répertoires du CVS quand il doit créer un fichier .tar.gz. "
 "On peut répéter cette option pour exclure plusieurs fichiers."
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+#, fuzzy
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+"Toutes les options B<-sX> s'excluent mutuellement. Si vous en indiquez "
+"plusieurs, seule la dernière sera prise en compte."
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>"
+msgid "B<Build options (with -b):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
+msgstr ""
+"Les options B<-sa>, B<-sp>, B<-sk>, B<-su> et B<-sr> ne remplacent pas les "
+"fichiers «\\ tar\\ » ou les répertoires existants. Pour cela, il faut "
+"utiliser les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
+
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-s>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:154
+#, fuzzy
+msgid ""
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 "Quand on spécifie B<-sk> ou B<-sp,> B<dpkg-source> s'attend à ce que le "
 "source originel soit un fichier «\\ tar\\ »\\ ; par défaut, c'est le fichier "
@@ -7448,13 +7425,30 @@ msgstr ""
 "n'y est pas déjà. Quand on utilise -sp> au lieu de B<-sk,> il le supprime "
 "ensuite."
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-s>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:167
+#, fuzzy
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
 msgstr ""
 "Quand on spécifie B<-su> ou B<-sr>, le source originel est attendu comme un "
 "répertoire\\ ; par défaut, c'est le répertoire I<paquet>B<->I<version-"
@@ -7462,14 +7456,31 @@ msgstr ""
 "originel. Quand on utilise B<-sr>, B<dpkg-source> supprime ce répertoire "
 "après usage."
 
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-s>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:180
+#, fuzzy
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 "Quand on utilise B<-ss>, B<dpkg-source> s'attend à ce que le source originel "
 "soit disponible à la fois comme un répertoire et comme un fichier «\\ tar\\ "
@@ -7478,13 +7489,20 @@ msgstr ""
 "avec cette option. Si le répertoire et le fichier «\\ tar\\ » ne "
 "correspondent pas, une mauvaise archive source en résulte."
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:186
+#, fuzzy
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 "Quand on utilise B<-sn>, B<dpkg-source> ne cherche pas de source originel, "
 "et ne crée pas de «\\ diff\\ ». Le second argument, s'il existe, doit être "
@@ -7492,22 +7510,27 @@ msgstr ""
 "un source originel distinct et donc, pas de fichier «\\ diff\\ » de "
 "debianisation."
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--split>, B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:212
 #, fuzzy
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 "Quand on utilise B<-sa> ou B<-sA,> B<dpkg-source> cherche un source originel "
 "soit sous forme de fichier «\\ tar\\ », soit sous forme de répertoire -- le "
@@ -7525,37 +7548,27 @@ msgstr ""
 "revient à utiliser l'option B<-sP)>\\ ; ou bien il provoque une erreur si "
 "l'option B<-sa> a été spécifiée. L'option par défaut est B<-sA>."
 
-# type: Plain text
-#: ../../man/dpkg-source.1:217
-msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
-msgstr ""
-"Les options B<-sa>, B<-sp>, B<-sk>, B<-su> et B<-sr> ne remplacent pas les "
-"fichiers «\\ tar\\ » ou les répertoires existants. Pour cela, il faut "
-"utiliser les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
-
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr "B<-sp>,B<-su>,B<-sn> avec B<-x>"
+msgid "B<Extract options (with -x):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 "Dans tous ces cas, l'arborescence existante d'un source originel est "
 "supprimée."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
+#, fuzzy
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 "Quand on utilise l'option B<-sp> lors d'une extraction, le source originel "
 "(s'il existe) est laissé en tant que fichier «\\ tar\\ ». S'il n'est pas "
@@ -7564,32 +7577,25 @@ msgstr ""
 "comportement par défaut."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:225
+#, fuzzy
+msgid "Unpacks the original source tree."
 msgstr "L'option B<-su> dépaquète une arborescence source originelle."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
+#: ../../man/dpkg-source.1:230
+#, fuzzy
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 "L'option B<-sn> assure que le source originel ne sera ni copié dans le "
 "répertoire en cours, ni dépaqueté. Une arborescence source originelle "
 "présente dans le répertoire en cours est toujours supprimée."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
-msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
-msgstr ""
-"Toutes les options B<-sX> s'excluent mutuellement. Si vous en indiquez "
-"plusieurs, seule la dernière sera prise en compte."
-
-# type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -7601,7 +7607,7 @@ msgstr ""
 "paquet et les numéros de version."
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
@@ -8087,20 +8093,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-split> et cette page de manuel ont été écrits par Ian Jackson.  "
-"Copyright (C) 1995-1996 Ils ont été édités sous la «\\ GNU General Public "
-"Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de GARANTIE. Voyez B</"
-"usr/share/dpkg/copyright> et B</usr/share/common-licenses/GPL> pour des "
-"précisions."
-
 # type: TP
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -8280,11 +8272,6 @@ msgstr ""
 "Note\\ : dpkg-statoverride garde une copie de ce fichier, avec une extension "
 "-old, avant de le remplacer par un nouveau."
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
 # type: TH
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -10024,15 +10011,10 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<emacs>(1), B<info>(1), B<gzip>(1)."
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
-msgstr ""
-"Copyright 1994, Ian Jackson. B<install-info> est un logiciel libre\\ ; voyez "
-"la «\\ GNU General Public Licence\\ » version 2 ou supérieure pour le "
-"copyright. Il I<n'y a pas> de garantie."
+#: ../../man/install-info.8:293
+#, fuzzy
+msgid "Copyright 1994 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -10892,8 +10874,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/update-alternatives.8:204
-#, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+#, fuzzy, no-wrap
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<gen lien altern priorité> [B<--slave> I<gen lien altern>] ..."
 
 # type: Plain text
@@ -11271,37 +11253,20 @@ msgstr ""
 "soit dans la documentation\\ ; faites un rapport."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Le programme de Debian «\\ update-alternatives\\ » est sous copyright 1995 "
-"Ian Jackson. C'est un logiciel libre\\ ; Voyez la «\\ GNU General Public "
-"Licence\\ » version 2 ou supérieure pour les conditions du copyright. Il n'y "
-"a AUCUNE garantie."
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
-msgstr ""
-"Cette page de manuel est sous copyright 1997/98 Charles Briscoe-Smith.  "
-"C'est une documentation libre ; Voyez la «\\ GNU General Public Licence\\ » "
-"version 2 ou supérieure pour les conditions du copyright. Il n'y a AUCUNE "
-"garantie."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
+#, fuzzy
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
-"On peut trouver la licence GNU GPL dans /usr/share/common-licenses/GPL sur "
-"tous les systèmes Debian."
+"Ce programme est un logiciel libre\\ ; voyez la «\\ GNU General Public "
+"Licence\\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
+"garantie."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:405
@@ -11309,6 +11274,194 @@ msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 "B<ln>(1), FHS, le standard pour l'organisation des systèmes de fichiers."
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Ce programme est un logiciel libre\\ ; voyez la «\\ GNU General Public "
+#~ "Licence\\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
+#~ "garantie."
+
+# type: Plain text
+#~ msgid "The utilities and this manpage were written by Ian Jackson."
+#~ msgstr "Ces outils et cette page de manuel ont été écrits par Ian Jackson."
+
+# type: SH
+#~ msgid "COPYRIGHT"
+#~ msgstr "COPYRIGHT"
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<rep> | B<--admindir=>I<rep> | B<--instdir=>I<rep>"
+
+# type: Plain text
+#~ msgid ""
+#~ "These options control whether the original source archive is included in "
+#~ "the upload generated by B<dpkg-buildpackage> if any source is being "
+#~ "generated (i.e., B<-b> or B<-B> haven't been used)."
+#~ msgstr ""
+#~ "Ces options contrôlent si l'archive source originale est incluse dans "
+#~ "l'installation produite par B<dpkg-buildpackage> quand on construit un "
+#~ "paquet source (les options B<-b> or B<-B> n'ont pas été utilisées)."
+
+# type: Plain text
+#~ msgid ""
+#~ "Include the original source if the version number ends in B<-0> or B<-1>, "
+#~ "i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
+#~ "B<This is the default.>"
+#~ msgstr ""
+#~ "Inclure les sources originales si le numéro de version se termine par B<-"
+#~ "0> ou B<-1>, c'est-à-dire si la partie «\\ révision Debian\\ » du numéro "
+#~ "de version est égal à B<0> ou B<1>. B<C'est le comportement par défaut.>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> et cette page de manuel ont été écrits par Ian Jackson. Le "
+#~ "copyright (C) date de 1995-1996 et ils ont paru sous la licence «\\ GNU "
+#~ "General Public Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de "
+#~ "garantie. Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-"
+#~ "licenses/GPL> pour des précisions."
+
+# type: TP
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<-si>, B<-sa>, B<-sd>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+#~ "exclusion and includes only the diff."
+#~ msgstr ""
+#~ "L'option B<-sa> force l'inclusion des sources originales\\ ; l'option B<-"
+#~ "sd> force leur exclusion et inclut seulement le «\\ diff_ »."
+
+# type: Plain text
+#~ msgid ""
+#~ "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify "
+#~ "that a binary-only build is taking place.  B<-b> indicates that no source "
+#~ "files are to be built and/or distributed, and B<-B> that no architecture-"
+#~ "independent binary package files are to be distributed either.  B<-S> "
+#~ "specifies that only the source should be uploaded and no binary packages "
+#~ "need to be made. The distinction between B<-b> and B<-B> is only used by "
+#~ "B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+#~ "for whatever files were produced by the B<binary-*> target(s) of the "
+#~ "package being built."
+#~ msgstr ""
+#~ "Avec B<dpkg-genchanges> et B<dpkg-buildpackage> les options B<-b> et B<-"
+#~ "B> indiquent qu'on veut seulement construire un paquet binaire. L'option "
+#~ "B<-b> indique qu'aucun fichier source n'est à construire ou à distribuer, "
+#~ "et l'option B<-B> indique en plus qu'aucun fichier, appartenant à un "
+#~ "paquet binaire ne dépendant pas d'une architecture, n'est à distribuer. "
+#~ "L'option B<-S> indique que seul le source doit être installé et qu'on a "
+#~ "pas besoin de construire un paquet binaire. Seul B<dpkg-buildpackage> se "
+#~ "sert des options B<-b> et B<-B>. B<dpkg-genchanges> crée seulement un "
+#~ "fichier B<.changes> pour tous les fichiers produits par la cible B<binary-"
+#~ "*> du paquet qui est construit."
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> est un logiciel libre"
+#~ "\\ ; voyez la «\\ GNU General Public Licence\\ » version 2 ou supérieure "
+#~ "pour le copyright. Il n'y a B<pas> de garantie."
+
+# type: Plain text
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Copyright 2001 Wichert Akkerman"
+
+# type: TP
+#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>"
+
+# type: TP
+#~ msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+#~ msgstr "B<-sp>,B<-su>,B<-sn> avec B<-x>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-split> et cette page de manuel ont été écrits par Ian Jackson.  "
+#~ "Copyright (C) 1995-1996 Ils ont été édités sous la «\\ GNU General Public "
+#~ "Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de GARANTIE. Voyez "
+#~ "B</usr/share/dpkg/copyright> et B</usr/share/common-licenses/GPL> pour "
+#~ "des précisions."
+
+# type: Plain text
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1994, Ian Jackson. B<install-info> est un logiciel libre\\ ; "
+#~ "voyez la «\\ GNU General Public Licence\\ » version 2 ou supérieure pour "
+#~ "le copyright. Il I<n'y a pas> de garantie."
+
+# type: Plain text
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Le programme de Debian «\\ update-alternatives\\ » est sous copyright "
+#~ "1995 Ian Jackson. C'est un logiciel libre\\ ; Voyez la «\\ GNU General "
+#~ "Public Licence\\ » version 2 ou supérieure pour les conditions du "
+#~ "copyright. Il n'y a AUCUNE garantie."
+
+# type: Plain text
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Cette page de manuel est sous copyright 1997/98 Charles Briscoe-Smith.  "
+#~ "C'est une documentation libre ; Voyez la «\\ GNU General Public Licence\\ "
+#~ "» version 2 ou supérieure pour les conditions du copyright. Il n'y a "
+#~ "AUCUNE garantie."
+
+# type: Plain text
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "On peut trouver la licence GNU GPL dans /usr/share/common-licenses/GPL "
+#~ "sur tous les systèmes Debian."
+
 # type: TH
 #~ msgid "2006-04-09"
 #~ msgstr "09-04-2006"
@@ -11758,10 +11911,6 @@ msgstr ""
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
 
-# type: TP
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--split>, B<-s>"
-
 # type: TP
 #~ msgid "B<--join>, B<-j>"
 #~ msgstr "B<--join>, B<-j>"
diff --git a/man/po/hu.po b/man/po/hu.po
index b7a37b94..142eaf02 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2006-10-05 21:27+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -144,7 +144,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -167,9 +167,9 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -185,15 +185,16 @@ msgstr ""
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
@@ -208,9 +209,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "SZERZŐ"
@@ -232,12 +234,16 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2007-03-06"
-msgstr "2006-02-28"
+msgid "2007-07-18"
+msgstr "2006-06-17"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -298,19 +304,20 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>, B<-h>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -321,25 +328,25 @@ msgid "Show the usage message and exit."
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -351,13 +358,12 @@ msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FÁJLOK"
@@ -387,17 +393,28 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
+"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
+"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
+"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
+"licenses/GPL> fájlt a részletekért."
 
 # type: TH
 #: ../../man/deb.5:1
@@ -1183,19 +1200,6 @@ msgstr "B<dpkg>(1)."
 msgid "deb-substvars"
 msgstr ""
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1432,7 +1436,7 @@ msgid "List of substitution variables and values."
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1447,48 +1451,23 @@ msgid ""
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
-"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
-"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
-"licenses/GPL> fájlt a részletekért."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, fuzzy, no-wrap
@@ -1744,11 +1723,11 @@ msgstr ""
 msgid "ACTIONS"
 msgstr "MŰVELETI LEHETŐSÉGEK"
 
-# type: TP
+# type: Plain text
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
 #: ../../man/dpkg.1:97
@@ -1805,9 +1784,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
+msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 # type: Plain text
 #: ../../man/dpkg.1:129
@@ -1819,7 +1798,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:129
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 # type: Plain text
@@ -1849,7 +1828,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:144
 #, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 # type: Plain text
@@ -1884,11 +1863,11 @@ msgstr ""
 msgid "B<3.> Run I<postrm> script"
 msgstr ""
 
-# type: TP
+# type: Plain text
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
 #: ../../man/dpkg.1:176
@@ -1908,11 +1887,11 @@ msgid ""
 "B<dselect update>."
 msgstr ""
 
-# type: TP
+# type: Plain text
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
 #: ../../man/dpkg.1:185
@@ -1925,7 +1904,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:185
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+msgid "B<--forget-old-unavail>"
 msgstr ""
 
 # type: Plain text
@@ -1935,9 +1914,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
+msgstr "B<--old>"
 
 # type: Plain text
 #: ../../man/dpkg.1:191
@@ -1947,9 +1926,9 @@ msgstr "Egy bináris csomagarchívumról ad információkat."
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<--new>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -1958,11 +1937,11 @@ msgid ""
 "system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
 
-# type: TP
+# type: Plain text
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
 #: ../../man/dpkg.1:200
@@ -1973,9 +1952,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
+msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/dpkg.1:206
@@ -1988,9 +1967,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
+msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/dpkg.1:211
@@ -2003,7 +1982,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:211
 #, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+msgid "B<--yet-to-unpack>"
 msgstr ""
 
 # type: Plain text
@@ -2015,9 +1994,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
 #: ../../man/dpkg.1:219
@@ -2028,7 +2007,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:219
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 # type: Plain text
@@ -2046,24 +2025,18 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, fuzzy, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<--help>, B<-h>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2071,9 +2044,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
 #: ../../man/dpkg.1:241
@@ -2082,9 +2055,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--debug>, B<-D>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2093,21 +2066,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, fuzzy, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<--version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 #, fuzzy
@@ -2132,24 +2099,24 @@ msgstr ""
 #: ../../man/dpkg.1:273
 #, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 
 # type: TP
@@ -2164,23 +2131,24 @@ msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:291
+#: ../../man/dpkg.1:292
 #, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2189,24 +2157,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr ""
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2215,13 +2183,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2229,7 +2197,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2246,13 +2214,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2261,7 +2229,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2269,19 +2237,19 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2291,19 +2259,19 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2311,7 +2279,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2319,32 +2287,32 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2352,7 +2320,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2360,7 +2328,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2369,88 +2337,88 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 #, fuzzy, no-wrap
-msgid "B<--new> | B<--old>"
+msgid "B<--new>, B<--old>"
 msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2458,7 +2426,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2467,13 +2435,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr ""
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2481,46 +2449,71 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, fuzzy, no-wrap
 msgid "B<-G>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--showformat=>I<formátum>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
+msgid ""
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--field>, B<-f>"
+
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<--info>, B<-I>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2528,26 +2521,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr ""
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -2558,13 +2551,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--licence>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2578,64 +2571,64 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, fuzzy, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2643,93 +2636,93 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, fuzzy, no-wrap
 msgid "I<control>"
 msgstr "kontroll"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, fuzzy, no-wrap
@@ -2737,58 +2730,58 @@ msgid "EXAMPLES"
 msgstr "PÉLDA"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -2796,24 +2789,24 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -2821,58 +2814,58 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, fuzzy, no-wrap
 msgid "AUTHORS"
 msgstr "SZERZŐ"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, fuzzy, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -2885,6 +2878,12 @@ msgstr "Lásd a I</usr/share/doc/dpkg/THANKS> fájlt, melyben a B<dpkg> készít
 msgid "dpkg-architecture"
 msgstr ""
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -3635,7 +3634,7 @@ msgstr "B<--new>"
 #: ../../man/dpkg-buildpackage.1:19
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 
 # type: TP
@@ -3652,7 +3651,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<--new>"
@@ -3663,57 +3662,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -3721,39 +3720,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, fuzzy, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B< >E<lt>hosszú leírásE<gt>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -3761,13 +3760,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -3775,86 +3774,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, no-wrap
 msgid "B<-tc>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -3869,13 +3868,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -3887,69 +3886,62 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--licence>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr ""
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -3957,8 +3949,8 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -3968,14 +3960,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<--help>, B<-h>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4029,7 +4021,7 @@ msgstr "B<--new>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr ""
 
 # type: UR
@@ -4040,7 +4032,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr ""
 
 # type: TH
@@ -4080,7 +4072,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4094,7 +4086,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
@@ -4218,7 +4210,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
@@ -4267,7 +4259,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
 #, fuzzy, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
@@ -4381,7 +4373,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
 
 # type: Plain text
@@ -4566,20 +4558,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-#, fuzzy
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
-"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
-"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
-"licenses/GPL> fájlt a részletekért."
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, fuzzy, no-wrap
@@ -4606,8 +4584,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -4832,19 +4810,19 @@ msgstr ""
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -4871,65 +4849,58 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
+msgid "B<-b>, B<-B>"
 msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -4937,74 +4908,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--field>, B<-f>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<--show>, B<-W>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<--control>, B<-e>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5012,21 +4963,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5035,13 +4986,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5049,13 +5000,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5063,7 +5014,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5075,6 +5026,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "deb-control"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5378,11 +5336,8 @@ msgid ""
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+msgid "Copyright 1995,1996 Erick Branderhorst"
 msgstr ""
 
 # type: TH
@@ -5461,7 +5416,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
@@ -5493,7 +5448,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
@@ -5509,7 +5464,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
@@ -5522,20 +5477,20 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
@@ -5549,7 +5504,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
@@ -5661,7 +5616,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
+msgid "Copyright (C) 2001 Wichert Akkerman"
 msgstr ""
 
 # type: UR
@@ -6247,117 +6202,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<--new>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<--new>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--info>, B<-I>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6365,7 +6368,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
@@ -6755,20 +6758,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-#, fuzzy
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
-"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
-"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
-"licenses/GPL> fájlt a részletekért."
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -6911,11 +6900,6 @@ msgid ""
 "extension \"-old\", before replacing it with the new one."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr ""
-
 # type: TH
 #: ../../man/dselect.1:1
 #, fuzzy, no-wrap
@@ -8252,11 +8236,8 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+msgid "Copyright 1994 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -8926,7 +8907,7 @@ msgstr ""
 # type: TP
 #: ../../man/update-alternatives.8:204
 #, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr ""
 
 # type: Plain text
@@ -9230,33 +9211,68 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-msgstr ""
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
+#, fuzzy
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
+"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
+"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
+"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
+"licenses/GPL> fájlt a részletekért."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<--version>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a "
+#~ "Copyright (C)1995-1996 bejegyzést és adta ki GNU General Public Licence "
+#~ "alatt; NINCS GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/"
+#~ "share/common-licenses/GPL> fájlt a részletekért."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a "
+#~ "Copyright (C)1995-1996 bejegyzést és adta ki GNU General Public Licence "
+#~ "alatt; NINCS GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/"
+#~ "share/common-licenses/GPL> fájlt a részletekért."
+
 # type: TH
 #, fuzzy
 #~ msgid "2006-04-09"
@@ -9410,11 +9426,6 @@ msgstr ""
 #~ msgid "dpkg-GENCONTROL OPTIONS"
 #~ msgstr "MÁS LEHETŐSÉGEK"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--info>, B<-I>"
-
 # type: TP
 #, fuzzy
 #~ msgid "B<--join>, B<-j>"
diff --git a/man/po/ja.po b/man/po/ja.po
index ab55e3ef..7f991788 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2006-09-19 20:31+0900\n"
 "Last-Translator: KISE Hiroshi <kise@fuyuneko.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -177,9 +177,9 @@ msgstr "B<822-date> には引数やオプションはない。"
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -195,15 +195,16 @@ msgstr "この機能は実際には B<date>(1) の一部であるべきである
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
@@ -218,9 +219,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -246,12 +248,16 @@ msgid "cleanup-info"
 msgstr "cleanup-info"
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2007-03-06"
-msgstr "2006-04-09"
+msgid "2007-07-18"
+msgstr "2006-06-17"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -324,19 +330,20 @@ msgstr ""
 "B<警告: `--unsafe' オプションは正しいファイルを改竄してしまうかもしれない!>"
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -348,25 +355,25 @@ msgid "Show the usage message and exit."
 msgstr "利用方法を表示して正常終了する。"
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -378,13 +385,12 @@ msgstr "バージョン情報を出力して終了する。"
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -416,16 +422,24 @@ msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+#, fuzzy
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -1295,19 +1309,6 @@ msgstr "B<dpkg-deb actions>"
 msgid "deb-substvars"
 msgstr "B<deinstall>"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1546,7 +1547,7 @@ msgid "List of substitution variables and values."
 msgstr "使用できるパッケージの一覧。"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1563,52 +1564,25 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, fuzzy, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"著作権\n"
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"COPYRIGHT"
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 #, fuzzy
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 #, fuzzy
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1905,8 +1879,8 @@ msgstr "アクション"
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<package_file>..."
 
 # type: Plain text
@@ -1979,8 +1953,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<package_file> ..."
 
 # type: Plain text
@@ -1995,8 +1969,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2031,8 +2005,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2076,8 +2050,8 @@ msgstr "B<3.> I<postrm> スクリプトを実行する。"
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 
 # type: Plain text
@@ -2108,8 +2082,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 
 # type: Plain text
@@ -2126,8 +2100,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2137,8 +2111,8 @@ msgstr "インストールされていなくて利用可能でないパッケー
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2148,9 +2122,9 @@ msgstr "利用可能なパッケージの情報を消去する。"
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2163,8 +2137,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<package-name-pattern>...]"
 
 # type: Plain text
@@ -2178,8 +2152,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2197,8 +2171,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
@@ -2214,8 +2188,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2229,8 +2203,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2241,8 +2215,8 @@ msgstr "B<dpkg> のインストールするアーキテクチャ(例えば、\"i
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2267,14 +2241,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2282,12 +2257,6 @@ msgstr ""
 "プションはコマンドラインとこのファイル記述子を通じて指定でき、一回の実行を通"
 "じてそれらがリセットされることはない。"
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2295,8 +2264,8 @@ msgstr "簡単なオプション一覧を表示する。"
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2306,9 +2275,9 @@ msgstr "B<--force->I<thing> オプション一覧を表示する。"
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--debug>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2317,21 +2286,15 @@ msgstr "デバッグ用オプション一覧を表示する。"
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr "B<dpkg> のライセンスを表示する。"
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2350,26 +2313,26 @@ msgstr "以下のアクションのくわしい情報は B<dpkg-deb>(1) を参
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
 "    deb パッケージを構築する。\n"
@@ -2400,19 +2363,20 @@ msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr "以下のアクションの詳細は、B<dpkg-query>(1) を参照すること。"
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
 "    指定したパターンにマッチする名前のパッケージを表示する。\n"
@@ -2426,7 +2390,7 @@ msgstr ""
 "    I</var/lib/dpkg/available> にある I<package> の詳細情報を表示する。\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2439,24 +2403,24 @@ msgstr ""
 "トである。"
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<number>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr "B<dpkg> の処理を中断させるエラー数を変更する。デフォルトは 50 である。"
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2468,13 +2432,13 @@ msgstr ""
 "依存しているパッケージの設定を取り消す。"
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2485,7 +2449,7 @@ msgstr ""
 "るので注意すること)。B<-Dh> または B<--debug=help> はこれらの値を表示する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2513,13 +2477,13 @@ msgstr ""
 " 2000   正気でないほどの大量の情報\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2532,7 +2496,7 @@ msgstr ""
 "のは、デフォルトで強制実行される。"
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2543,12 +2507,12 @@ msgstr ""
 "まうかもしれない。>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: 全ての強制オプションを指定する(または打ち消す)。"
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2557,7 +2521,7 @@ msgstr ""
 "指定したパッケージをインストールする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2572,7 +2536,7 @@ msgstr ""
 "すること。>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2581,13 +2545,13 @@ msgstr ""
 "まだ設定されていないパッケージも一緒に設定をする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: たとえ \"hold\" とマークされていても、そのパッケージの処理をする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2598,7 +2562,7 @@ msgstr ""
 "管理されないで残るなどの問題がおこるかもしれない。"
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2610,18 +2574,18 @@ msgstr ""
 "して削除すること。"
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: すべての依存問題を警告に変える。"
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr "B<depends-version>: 依存関係の確認をするとき、バージョンを無視する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2630,7 +2594,7 @@ msgstr ""
 "ファイルを上書きすることになるため、危険である。"
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2639,7 +2603,7 @@ msgstr ""
 "は、変更(ファイルを削除したこと)を保存しないため、危険である。"
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2650,7 +2614,7 @@ msgstr ""
 "た場合は、デフォルトの動作が優先される。"
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2661,7 +2625,7 @@ msgstr ""
 "デフォルトの動作が優先される。"
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2674,21 +2638,21 @@ msgstr ""
 "されたオプションによって最終的な動作が決まる。"
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: あるパッケージで提供されているファイルを、インストールするパッ"
 "ケージのファイルで上書きする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: あるパッケージで提供されているディレクトリを、インストール"
 "するパッケージのファイルで上書きする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2696,13 +2660,13 @@ msgstr ""
 "い)版のファイルで上書きする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
 "B<architecture>: パッケージが間違ったアーキテクチャ用であっても処理をする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2710,25 +2674,25 @@ msgstr ""
 "起きる可能性は高い。"
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: root でないときでも、それをインストール(または削除)しようと試み"
 "る。"
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr "B<bad-verify>: 信頼性チェックに失敗してもインストールする。"
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<package>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2737,13 +2701,13 @@ msgstr ""
 "競合に対して警告メッセージを出して、アクションを実行する)。"
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2751,13 +2715,13 @@ msgstr ""
 "オプションである。"
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2766,13 +2730,13 @@ msgstr ""
 "B<dpkg-deb>(1) のオプションである。"
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2783,7 +2747,7 @@ msgstr ""
 "るためのものである。"
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2797,13 +2761,13 @@ msgstr ""
 "うことになる)。"
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2814,13 +2778,13 @@ msgstr ""
 "そして B<--avail> アクションとともに使うことができる。"
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
@@ -2829,22 +2793,35 @@ msgstr ""
 "い。これは B<--refuse-downgrade> の別名である。"
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir=>I<dir>"
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir=>I<dir>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
+#, fuzzy
+msgid ""
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "デフォルトのディレクトリを変更する。B<admindir> はインストール済みのパッケー"
 "ジやインストールされていないパッケージの状態に関する情報などを提供する、多数"
@@ -2856,14 +2833,27 @@ msgstr ""
 "B<instdir> を I<dir> に、B<admindir> を I<dir>B</var/lib/dpkg> に変更する。"
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir=>I<dir>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2874,13 +2864,13 @@ msgstr ""
 "除されるのは、そのパッケージが削除されるよう選択されているということである。"
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2889,13 +2879,13 @@ msgstr ""
 "い。"
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -2911,13 +2901,13 @@ msgstr ""
 "'current-conffile' 'new-conffile' useredited distedited' として報告される。"
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2940,42 +2930,42 @@ msgstr ""
 "変更で、I<E<lt>decisionE<gt>> は install か keep のどちらかである。"
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "パッケージの署名を確認しない。"
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "オプションのデフォルト値を記述する設定ファイル。"
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "デフォルトのログファイル(I</etc/dpkg/dpkg.cfg>(5) と B<--log> オプションも参"
 "照)。"
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -2984,24 +2974,24 @@ msgstr ""
 "するかについては、B<--admindir> オプションの項を参照すること。"
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "使用できるパッケージの一覧。"
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -3012,7 +3002,7 @@ msgstr ""
 "パッケージに関する情報>の項を参照すること。"
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -3021,55 +3011,55 @@ msgstr ""
 "に関するくわしい情報は、B<deb>(5) を参照すること。"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "環境変数"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3078,24 +3068,24 @@ msgstr ""
 "(suspend)するのではなく、新しいシェルを起動する。"
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3104,7 +3094,7 @@ msgstr ""
 "のみ参照されている。"
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3112,51 +3102,51 @@ msgid "EXAMPLES"
 msgstr "例"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "B<vi>(1) エディタに関連のあるパッケージの一覧を表示する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "2 つのパッケージの I</var/lib/dpkg/available> にある項目を表示する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "自分でパッケージのリストから検索する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "elvis パッケージを削除する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3166,7 +3156,7 @@ msgstr ""
 "セクションに属している。"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3176,24 +3166,24 @@ msgstr ""
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "パッケージ選択状況のコピーを作成する。"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>myselections>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr "このファイルをほかのコンピュータに転送して、インストールする。"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3203,12 +3193,13 @@ msgstr ""
 "     B<dpkg --set-selections E<lt>myselections>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "これは実際にはインストールも削除もしないことに注意。これは単に要求している"
 "パッケージの選択状態を設定するだけである。実際に要求しているパッケージをダウ"
@@ -3216,7 +3207,7 @@ msgstr ""
 "B<dselect> を起動して、\"導入(Install)\" を選べばよい。"
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3225,22 +3216,23 @@ msgstr ""
 "ある。"
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "機能の追加"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "I<apt>、I<aptitude>、I<debsums> パッケージをインストールすると便利な機能を追"
 "加できる。"
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3249,22 +3241,22 @@ msgstr ""
 "(5), B<dpkg.cfg>(5), B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "著者"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3279,6 +3271,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4025,10 +4023,11 @@ msgstr "B<-B>"
 
 # type: Plain text
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
-msgstr ""
+"distributed."
+msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 # type: TP
 #: ../../man/dpkg-buildpackage.1:19 ../../man/dpkg-checkbuilddeps.1:23
@@ -4044,7 +4043,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<-G>"
@@ -4056,57 +4055,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, fuzzy, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4114,39 +4113,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, fuzzy, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B< >E<lt>長い説明E<gt>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4154,13 +4153,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4168,88 +4167,88 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 #, fuzzy
 msgid "Do not check build dependencies and conflicts."
 msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy, no-wrap
 msgid "B<-tc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4264,13 +4263,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4282,71 +4281,64 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy
 msgid "Specify a key-ID to use when signing packages."
 msgstr "これは新しいパッケージを作る時に使うことができる。"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy
 msgid "Do not sign the source package."
 msgstr "パッケージの短い説明文"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, fuzzy, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir=>I<dir>"
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4356,8 +4348,8 @@ msgstr ""
 "ある。"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4367,14 +4359,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4438,7 +4430,8 @@ msgstr "B<-h>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+#, fuzzy
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4449,7 +4442,8 @@ msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TP
@@ -4490,7 +4484,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4504,7 +4498,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
 msgid "B<debian/files>"
@@ -4629,7 +4623,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
 
 # type: Plain text
@@ -4679,7 +4673,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
 #, fuzzy, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
 
 # type: Plain text
@@ -4796,7 +4790,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
 
 # type: Plain text
@@ -4987,20 +4981,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-#, fuzzy
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作権は"
-"彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布される。これ"
-"らは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</usr/share/"
-"common-licenses/GPL> を参照すること。"
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -5027,9 +5007,10 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
+#, fuzzy
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5292,26 +5273,29 @@ msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:114
+#, fuzzy
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 "システムの現在の退避リストを含むファイル。これは dpkg で使われる重要なファイ"
 "ル `status' や `available' がある dpkg の管理ディレクトリにある。"
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 "注意: B<dpkg-divert> はこのファイルを更新する時に、古いバージョンを \"-old\" "
 "という名前をつけたファイルにコピーしておく。"
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+#, fuzzy
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
@@ -5340,65 +5324,59 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<--show>, B<-W>"
+msgid "B<-b>, B<-B>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
+#, fuzzy
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
-msgstr ""
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
+msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5406,74 +5384,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-t>|B<--test>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5481,21 +5439,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5504,13 +5462,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5518,13 +5476,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5532,7 +5490,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5544,6 +5502,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "deb-control"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5881,15 +5846,10 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+#, fuzzy
+msgid "Copyright 1995,1996 Erick Branderhorst"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -5972,7 +5932,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<-l> | B<--list> I<package-name-pattern> ..."
 
 # type: Plain text
@@ -6014,7 +5974,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<-W> | B<--show> I<package-name-pattern> ..."
 
 # type: Plain text
@@ -6035,7 +5995,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-s> | B<--status> I<package-name> ..."
 
 # type: Plain text
@@ -6050,13 +6010,14 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L> | B<--listfiles> I<package-name> ..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 "B<package-name> によってインストールしたファイルを表示する。ただし、パッケー"
@@ -6066,7 +6027,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S> | B<--search> I<filename-search-pattern> ..."
 
 # type: Plain text
@@ -6084,7 +6045,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p> |B<--print-avail> I<package-name>"
 
 # type: Plain text
@@ -6239,8 +6200,9 @@ msgstr "設定すると、B<--list> オプションによる出力の横幅を
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
+#, fuzzy
+msgid "Copyright (C) 2001 Wichert Akkerman"
+msgstr "Copyright 2000 Wichert Akkerman"
 
 # type: UR
 #: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83
@@ -6863,117 +6825,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--info>, B<-I>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6981,7 +6991,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
@@ -7374,20 +7384,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-#, fuzzy
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作権は"
-"彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布される。これ"
-"らは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</usr/share/"
-"common-licenses/GPL> を参照すること。"
-
 # type: TP
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7565,11 +7561,6 @@ msgstr ""
 "注意: dpkg-statoverride はこのファイルを新しく書き変える前に、古いコピーを "
 "\"-old\" を追加した名前で保存する。"
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
 # type: SS
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -9237,15 +9228,10 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<emacs>(1), B<info>(1), B<gzip(1).>"
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
-msgstr ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+#, fuzzy
+msgid "Copyright 1994 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -10074,8 +10060,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/update-alternatives.8:204
-#, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+#, fuzzy, no-wrap
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 
 # type: Plain text
@@ -10441,41 +10427,153 @@ msgstr ""
 "ば、実装か文書、どちらかのバグである。レポートをお願いしたい。"
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-
-# type: Plain text
-#: ../../man/update-alternatives.8:400
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
-msgstr ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:402
+#, fuzzy
 msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO warranty."
 
 # type: Plain text
 #: ../../man/update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+
+# type: SH
+#, fuzzy
+#~ msgid "COPYRIGHT"
+#~ msgstr ""
+#~ "#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "著作権\n"
+#~ "#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "COPYRIGHT"
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作"
+#~ "権は彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布され"
+#~ "る。これらは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</"
+#~ "usr/share/common-licenses/GPL> を参照すること。"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+
+# type: Plain text
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Copyright 2001 Wichert Akkerman"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作"
+#~ "権は彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布され"
+#~ "る。これらは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</"
+#~ "usr/share/common-licenses/GPL> を参照すること。"
+
+# type: Plain text
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+
+# type: Plain text
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+
+# type: Plain text
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+
+# type: Plain text
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+
 # type: TH
 #~ msgid "2006-04-09"
 #~ msgstr "2006-04-09"
@@ -10811,11 +10909,6 @@ msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--info>, B<-I>"
-
 # type: TP
 #, fuzzy
 #~ msgid "B<--join>, B<-j>"
diff --git a/man/po/pl.po b/man/po/pl.po
index bf42f2c2..023f2c2c 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.0\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2007-05-04 23:46+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgstr ""
 "uruchomiony z opcj± B<-R> dostarcza tej samej funkcjonalno¶ci."
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -178,9 +178,9 @@ msgstr "B<822-date> nie wymaga podania 
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -197,15 +197,16 @@ msgstr "To polecenie powinno by
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
@@ -220,9 +221,10 @@ msgstr "I<Internet Message Format> (RFC2822), B<date>(1)."
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
@@ -250,12 +252,16 @@ msgid "cleanup-info"
 msgstr "cleanup-info"
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
-#, no-wrap
-msgid "2007-03-06"
-msgstr "2007-03-06"
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-07-18"
+msgstr "2007-03-13"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -316,19 +322,20 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr "B<Ostrze¿enie: opcja `--unsafe' mo¿e uszkodziæ poprawny plik!>"
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -339,16 +346,16 @@ msgid "Show the usage message and exit."
 msgstr "Wy¶wietla informacjê o u¿ytkowaniu i koñczy dzia³anie."
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
@@ -356,9 +363,9 @@ msgstr "B<--version>"
 # type: Plain text
 #
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -369,13 +376,12 @@ msgstr "Wy
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "PLIKI"
@@ -405,16 +411,23 @@ msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+#, fuzzy
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Niniejszy program jest oprogramowaniem wolnym, sprawd¼ Powszechn± Licencjê "
 "Publiczn± GNU w wersji drugiej lub pó¼niejszej, by dowiedzieæ siê o "
@@ -1142,19 +1155,6 @@ msgstr "B<dpkg-shlibdeps>(1)."
 msgid "deb-substvars"
 msgstr "deb-substvars"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2007-01-24"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1394,7 +1394,7 @@ msgid "List of substitution variables and values."
 msgstr "Lista dostêpnych pakietów."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1411,46 +1411,23 @@ msgstr ""
 "(1), B<dpkg-source>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr "PRAWA AUTORSKIE"
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright (C) 2000 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Niniejszy program jest oprogramowaniem wolnym, sprawd¼ Powszechn± Licencjê "
-"Publiczn± GNU w wersji drugiej lub pó¼niejszej, by dowiedzieæ siê o "
-"warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1765,8 +1742,8 @@ msgstr "AKCJE"
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<plik_pakietu>..."
 
 # type: Plain text
@@ -1843,8 +1820,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<plik_pakietu> ..."
 
 # type: Plain text
@@ -1859,8 +1836,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<pakiet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1898,8 +1875,8 @@ msgstr "B<2.> Uruchomienie skryptu I<postinst>, je
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B< --purge >I<pakiet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1950,8 +1927,8 @@ msgstr "B<3.> Uruchomienie skryptu I<postrm>"
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<plik_pakietów>"
 
 # type: Plain text
@@ -1985,8 +1962,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<plik_pakietu> ..."
 
 # type: Plain text
@@ -2004,8 +1981,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2018,8 +1995,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2030,9 +2007,9 @@ msgstr "Skasowanie informacji o dost
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>, B<--quiet>"
 
 # type: Plain text
 #
@@ -2046,8 +2023,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<wzorzec-nazwy-pakietu>...]"
 
 # type: Plain text
@@ -2063,8 +2040,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2083,8 +2060,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
@@ -2101,8 +2078,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2117,8 +2094,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2132,8 +2109,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<wersja1 op wersja2>"
 
 # type: Plain text
@@ -2161,15 +2138,16 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2178,12 +2156,6 @@ msgstr ""
 "odczytane z tego deskryptora pliku nie s± czyszczone dla kolejnych poleceñ "
 "wykonywanych podczas tego samego przebiegu."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #
 #: ../../man/dpkg.1:238
@@ -2192,8 +2164,8 @@ msgstr "Wy
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2204,9 +2176,9 @@ msgstr "Wy
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<-D>, B<--debug>"
 
 # type: Plain text
 #
@@ -2216,9 +2188,9 @@ msgstr "Wy
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #
@@ -2226,12 +2198,6 @@ msgstr "B<dpkg --licence> | B<dpkg --license>"
 msgid "Display B<dpkg> licence."
 msgstr "Wy¶wietlenie licencji B<dpkg>."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #
 #: ../../man/dpkg.1:250
@@ -2253,26 +2219,26 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<katalog> [I<nazwa-pliku>]\n"
 "    Zbudowanie pakietu deb.\n"
@@ -2306,19 +2272,20 @@ msgstr ""
 "nastêpuj±cych dzia³aniach."
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<wzorzec-nazw-pakietów> ...\n"
 "    Wy¶wietla pakiety pasuj±ce do wzorca.\n"
@@ -2334,7 +2301,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2347,28 +2314,28 @@ msgstr ""
 "pocz±tkowych my¶lników), albo komentarzem (je¿eli zaczyna siê od B<#>)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<liczba>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Zmiana liczby b³êdów, po których B<dpkg> zaprzestanie dzia³ania. Domy¶lna "
 "warto¶æ to 50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2380,14 +2347,14 @@ msgstr ""
 "automatyczne dekonfigurowanie pakietów, które s± zale¿ne od usuwanego."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<oktal>B< | --debug=>I<oktal>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2399,7 +2366,7 @@ msgstr ""
 "warto¶ci."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2427,14 +2394,14 @@ msgstr ""
 " 2000   Reszta szczegó³owych informacji\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<dzia³anie> | B<--no-force->I<dzia³anie> | B<--refuse->I<dzia³anie>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2448,7 +2415,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2460,13 +2427,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: W³±cza (lub wy³±cza) wszystkie opcje typu \"force\"."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2476,7 +2443,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2493,7 +2460,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2503,7 +2470,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: Dzia³anie obejmie tak¿e pakiety oznaczone jako \"wstrzymane"
@@ -2511,7 +2478,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2523,7 +2490,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2536,14 +2503,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 "B<depends>: Zamiana wszystkich problemów z zale¿no¶ciami na ostrze¿enia."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
@@ -2552,7 +2519,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2563,7 +2530,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2574,7 +2541,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2586,7 +2553,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2598,7 +2565,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2612,7 +2579,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Nadpisanie plików z innych pakietów, w przypadku gdy dany plik "
@@ -2620,7 +2587,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir> Nadpisanie katalogów z innych pakietów, w przypadku gdy "
@@ -2628,7 +2595,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2636,13 +2603,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Dzia³anie obejmie pakiety z niepoprawn± architektur±."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2651,7 +2618,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Próba (de)instalacji, gdy dpkg nie jest uruchamiany z konta "
@@ -2659,21 +2626,21 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Instalowanie pakietu, nawet je¿eli nie powiedzie siê "
 "sprawdzenie jego autentyczno¶ci."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<pakiet>,..."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2683,14 +2650,14 @@ msgstr ""
 "tylko ostrze¿enie)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2698,14 +2665,14 @@ msgstr ""
 "przes³ana do B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2714,14 +2681,14 @@ msgstr ""
 "opcja jest przes³ana do B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2733,7 +2700,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2747,14 +2714,14 @@ msgstr ""
 "nie zrobi)."
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2765,14 +2732,14 @@ msgstr ""
 "B<--install>, B<--unpack> oraz B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
@@ -2781,23 +2748,36 @@ msgstr ""
 "Jest to dok³adnie to samo, co B<--refuse-downgrade>."
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<katalog> | B<--admindir=>I<katalog> | B<--instdir=>I<katalog>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir=>I<katalog>"
+
+# type: Plain text
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir=>I<katalog>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:465
+#, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Zmiana domy¶lnych katalogów. B<admindir> to domy¶lnie I</var/lib/dpkg>, "
 "gdzie przechowywane s± informacje o stanie zainstalowanych i "
@@ -2810,14 +2790,27 @@ msgstr ""
 "na I<katalog>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir=>I<katalog>"
+
+# type: Plain text
+#: ../../man/dpkg.1:469
+msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:469
+#: ../../man/dpkg.1:475
 msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
@@ -2830,14 +2823,14 @@ msgstr ""
 "wybrany do odinstalowania."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2846,14 +2839,14 @@ msgstr ""
 "systemie."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -2871,13 +2864,13 @@ msgstr ""
 "distedited'"
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<nazwa-pliku>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2902,42 +2895,42 @@ msgstr ""
 "install (instalacja nowej wersji), albo keep (zachowanie poprzedniej wersji)."
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "Nie próbuje weryfikowaæ sygnatur pakietu."
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Plik konfiguracyjny zawieraj±cy domy¶lne opcje."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr "Domy¶lny plik logu (patrz I</etc/dpkg/dpkg.cfg>(5) i opcja B<--log>)."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -2946,26 +2939,26 @@ msgstr ""
 "katalogów. Opcja B<--admindir> mo¿e zmieniæ lokalizacjê tych plików."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Lista dostêpnych pakietów."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2977,7 +2970,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -2986,56 +2979,56 @@ msgstr ""
 "nich mo¿na znale¼æ w B<deb>(5)."
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "ZMIENNE ¦RODOWISKA"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3044,27 +3037,27 @@ msgstr ""
 "zamiast usuwaæ B<dpkg> w t³o, gdy potrzeba wykonaæ co¶ w pow³oce."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "Program uruchamiany przez B<dpkg>, gdy trzeba uruchomiæ now± sesjê pow³oki."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3073,7 +3066,7 @@ msgstr ""
 "sformatowanego tekstu. Obecnie u¿ywane tylko przez opcjê -l."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3082,61 +3075,61 @@ msgstr "PRZYK
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 "Wy¶wietlenie wszystkich pakietów mog±cych byæ zwi±zanymi z edytorem B<vi>(1):"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "    B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Wy¶wietlenie informacji z pliku I</var/lib/dpkg/available> o dwóch pakietach:"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "Samodzielne przeszukanie informacji o pakietach:"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "Wykasowanie zainstalowanego pakietu elvis:"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3146,7 +3139,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3157,20 +3150,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "Aby stworzyæ kopiê lokalnie wybranych pakietów:"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>mojepakiety>\n"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3178,7 +3171,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3189,12 +3182,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Nale¿y zauwa¿yæ, ¿e ta opcja nie powoduje zainstalowania lub usuniêcia "
 "czegokolwiek, ale tylko zapisuje, ¿e pewne pakiety s± wybrane do "
@@ -3204,7 +3198,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3213,24 +3207,25 @@ msgstr ""
 "mo¿liwo¶ci zmiany ich stanu."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "DODATKOWA FUNKCJONALNO¦Æ"
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "Dodatkow± funkcjonalno¶æ mo¿na uzyskaæ, instaluj±c którykolwiek z "
 "nastêpuj±cych pakietów: I<apt>, I<aptitude> oraz I<debsums>."
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3240,22 +3235,22 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> podaje raczej zbyt ma³o pomocnych informacji."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORZY"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3270,6 +3265,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, no-wrap
+msgid "2007-03-06"
+msgstr "2007-03-06"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4056,11 +4057,13 @@ msgid "B<-b>"
 msgstr "B<-b>"
 
 # type: Plain text
+#
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
-msgstr ""
+"distributed."
+msgstr "Okre¶la "
 
 # type: TP
 #: ../../man/dpkg-buildpackage.1:19 ../../man/dpkg-checkbuilddeps.1:23
@@ -4076,7 +4079,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, no-wrap
 msgid "B<-S>"
 msgstr "B<-S>"
@@ -4088,57 +4091,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr "Okre¶la "
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, no-wrap
 msgid "B<-si>"
 msgstr "B<-si>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, no-wrap
 msgid "B<-sa>"
 msgstr "B<-sa>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr "Wymusza do³±czenie oryginalnego pakietu ¼ród³owego."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, no-wrap
 msgid "B<-sd>"
 msgstr "B<-sd>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<-a>I<architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4146,39 +4149,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4186,13 +4189,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4200,86 +4203,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: SS
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr "Nie sprawdza zale¿no¶ci czasu budowania ani konfliktów."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, no-wrap
 msgid "B<-W>"
 msgstr "B<-W>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, no-wrap
 msgid "B<-nc>"
 msgstr "B<-nc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, no-wrap
 msgid "B<-tc>"
 msgstr "B<-tc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr "B<-r>I<polecenie-uzyskiwania-praw-administratora>"
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4294,13 +4297,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr "B<-p>I<polecenie-podpisywania>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4312,72 +4315,65 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr "B<-k>I<id-klucza>"
 
 # type: Plain text
 #
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr "Okre¶la ID klucza u¿ywanego do podpisywania pakietów."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, no-wrap
 msgid "B<-us>"
 msgstr "B<-us>"
 
 # type: Plain text
 #
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr "Nie próbuje podpisywaæ pakietów."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, no-wrap
 msgid "B<-uc>"
 msgstr "B<-uc>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr "B<-i>[I<wyra¿-regul>]"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<nazwa_pliku>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir=>I<katalog>"
-
 # type: Plain text
 #
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4386,8 +4382,8 @@ msgstr ""
 "Zmienia po³o¿enie bazy danych B<dpkg>. Domy¶lnie jest to I</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4397,7 +4393,7 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
@@ -4405,7 +4401,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
 "(1), B<pgp>(1)."
@@ -4464,7 +4460,8 @@ msgstr "B<-h>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+#, fuzzy
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4475,7 +4472,8 @@ msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TP
@@ -4516,7 +4514,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4530,7 +4528,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
@@ -4664,8 +4662,8 @@ msgstr ""
 # type: Plain text
 #
 #: ../../man/dpkg-deb.1:78
-#, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<archiwum> [I<nazwa-pliku-kontrolnego> ...]"
 
 # type: Plain text
@@ -4720,8 +4718,8 @@ msgstr ""
 # type: Plain text
 #
 #: ../../man/dpkg-deb.1:101
-#, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<archiwum> [I<nazwa-pola-kontrolnego> ...]"
 
 # type: Plain text
@@ -4850,8 +4848,8 @@ msgstr ""
 # type: Plain text
 #
 #: ../../man/dpkg-deb.1:151
-#, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<katalog archiwum>"
 
 # type: Plain text
@@ -5056,20 +5054,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> i ten podrêcznik napisa³ Ian Jackson ((C)1995-1996). "
-"Udostêpnione na warunkach Ogólnej Licencji Publicznej GNU; BRAK "
-"JAKIEJKOLWIEK GWARANCJI. Szczegó³y mo¿na znale¼æ w I</usr/share/doc/dpkg/"
-"copyright> oraz I</usr/share/common-licences/GPL>."
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -5098,9 +5082,10 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
+#, fuzzy
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5359,10 +5344,11 @@ msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:114
+#, fuzzy
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 "Plik zawieraj±cy obecn± listê nadpisañ plików w systemie. Zlokalizowany jest "
 "w katalogu administracyjnym dpkg, ³±cznie z innymi plikami wa¿nymi dla dpkg, "
@@ -5370,16 +5356,18 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 "Uwaga: przed zast±pieniem pliku now± wersj±, B<dpkg-divert> zachowuje star± "
 "kopiê w pliku z rozszerzeniem \"-old\"."
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+#, fuzzy
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
@@ -5407,65 +5395,60 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-si>, B<-sa>, B<-sd>"
+#: ../../man/dpkg-genchanges.1:18
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>"
+msgstr "B<-b>, B<-B>, B<-S>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#
+#: ../../man/dpkg-genchanges.1:31
+#, fuzzy
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
-msgstr ""
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
+msgstr "Okre¶la "
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nazwa>B<=>I<warto¶æ>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5473,74 +5456,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<pole>B<=>I<warto¶æ>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<pole>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-b>, B<-B>, B<-S>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5548,21 +5511,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5571,13 +5534,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5585,13 +5548,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5599,7 +5562,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5611,6 +5574,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "dpkg-gencontrol"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2007-01-24"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5918,16 +5888,10 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
-msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.B<dpkg-name> jest oprogramowaniem "
-"wolnym, sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub "
-"pó¼niejszej, by dowiedzieæ siê o warunkach dystrybucji. Brak "
-"B<JAKIEJKOLWIEK> gwarancji."
+#: ../../man/dpkg-name.1:107
+#, fuzzy
+msgid "Copyright 1995,1996 Erick Branderhorst"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
 #
@@ -6015,8 +5979,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:14
-#, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<-l>, B<--list> I<wzorzec-nazwy-pakietu> ..."
 
 # type: Plain text
@@ -6061,8 +6025,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:33
-#, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<-W>, B<--show> I<wzorzec-nazwy-pakietu> ..."
 
 # type: Plain text
@@ -6083,8 +6047,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:40
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-s>, B<--status> I<nazwa-pakietu> ..."
 
 # type: Plain text
@@ -6099,15 +6063,16 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:44
-#, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<nazwa-pakietu> ..."
 
 # type: Plain text
 #
 #: ../../man/dpkg-query.1:49
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 "Podanie listy plików zainstalowanych z B<nazwy-pakietu>. Pliki, które "
@@ -6115,8 +6080,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
-#, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<wzorzec-wyszukiwania-nazwy-pliku> ..."
 
 # type: Plain text
@@ -6134,8 +6099,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:55
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<nazwa-pakietu>"
 
 # type: Plain text
@@ -6296,8 +6261,9 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
+#, fuzzy
+msgid "Copyright (C) 2001 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: UR
 #: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83
@@ -6881,117 +6847,166 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> z B<-b>"
+msgid "B<Build options (with -b):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-s>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-s>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<-si>, B<-sa>, B<-sd>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr "B<-sp>,B<-su>,B<-sn> z B<-x>"
+msgid "B<Extract options (with -x):>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:225
+#, fuzzy
+msgid "Unpacks the original source tree."
 msgstr "B<-su> rozpakowuje oryginalne"
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -7000,7 +7015,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
@@ -7516,20 +7531,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-split> oraz ten podrêcznik napisa³ Ian Jackson Copyright (C) 1995-"
-"1996 i udostêpni³ na Powszechnej Licencji Publicznej GNU w wersji 2 lub "
-"pó¼niejszej; BEZ JAKIEJKOLWIEK GWARANCJI. Szczegó³y w I</usr/share/doc/dpkg/"
-"copyright> oraz w I</usr/share/common-licences/GPL>."
-
 # type: TP
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7705,11 +7706,6 @@ msgstr ""
 "Uwaga: przed zast±pieniem pliku now± wersj±, dpkg-statoverride zachowuje "
 "star± kopiê w pliku z rozszerzeniem \"-old\"."
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
 # type: SS
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -9417,15 +9413,10 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<emacs>(1), B<info>(1), B<gzip(1).>"
 
 # type: Plain text
-#: ../../man/install-info.8:297
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
-msgstr ""
-"Copyright 1994 Ian Jackson. B<install-info> jest oprogramowaniem wolnym, "
-"sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej, "
-"by dowiedzieæ siê o warunkach dystrybucji. Brak I<JAKIEJKOLWIEK> gwarancji."
+#: ../../man/install-info.8:293
+#, fuzzy
+msgid "Copyright 1994 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
 #
@@ -10299,8 +10290,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/update-alternatives.8:204
-#, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+#, fuzzy, no-wrap
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<nazwa-ogólna symlink altern priorytet> [B<--slave> I<nazwa-ogólna symlink altern>] ..."
 
 # type: Plain text
@@ -10670,42 +10661,157 @@ msgstr ""
 "znalezienia jakichkolwiek rozbie¿no¶ci, prosimy o ich zg³oszenie."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Copyright 1995 Ian Jackson. Niniejszy program jest oprogramowaniem wolnym, "
-"sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej, "
-"by dowiedzieæ siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:400
+#: ../../man/update-alternatives.8:402
+#, fuzzy
 msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Tê stronê podrêcznika napisa³ w 1997/98 Charles Briscoe-Smith. Niniejsza "
-"dokumentacja jest oprogramowaniem wolnym, sprawd¼ Powszechn± Licencjê "
+"Niniejszy program jest oprogramowaniem wolnym, sprawd¼ Powszechn± Licencjê "
 "Publiczn± GNU w wersji drugiej lub pó¼niejszej, by dowiedzieæ siê o "
 "warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
-# type: Plain text
-#: ../../man/update-alternatives.8:402
-msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
-msgstr ""
-"W ka¿dym systemie Debiana GNU GPL mo¿na znale¼æ w pliku /usr/share/common-"
-"licenses/GPL."
-
 # type: Plain text
 #: ../../man/update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Niniejszy program jest oprogramowaniem wolnym, sprawd¼ Powszechn± "
+#~ "Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej, by dowiedzieæ "
+#~ "siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
+
+# type: SH
+#~ msgid "COPYRIGHT"
+#~ msgstr "PRAWA AUTORSKIE"
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<katalog> | B<--admindir=>I<katalog> | B<--instdir=>I<katalog>"
+
+# type: Plain text
+#
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> i ten podrêcznik napisa³ Ian Jackson ((C)1995-1996). "
+#~ "Udostêpnione na warunkach Ogólnej Licencji Publicznej GNU; BRAK "
+#~ "JAKIEJKOLWIEK GWARANCJI. Szczegó³y mo¿na znale¼æ w I</usr/share/doc/dpkg/"
+#~ "copyright> oraz I</usr/share/common-licences/GPL>."
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1995,1996 Erick Branderhorst.B<dpkg-name> jest oprogramowaniem "
+#~ "wolnym, sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub "
+#~ "pó¼niejszej, by dowiedzieæ siê o warunkach dystrybucji. Brak "
+#~ "B<JAKIEJKOLWIEK> gwarancji."
+
+# type: Plain text
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Copyright 2001 Wichert Akkerman"
+
+# type: TP
+#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> z B<-b>"
+
+# type: TP
+#~ msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+#~ msgstr "B<-sp>,B<-su>,B<-sn> z B<-x>"
+
+# type: Plain text
+#
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-split> oraz ten podrêcznik napisa³ Ian Jackson Copyright (C) 1995-"
+#~ "1996 i udostêpni³ na Powszechnej Licencji Publicznej GNU w wersji 2 lub "
+#~ "pó¼niejszej; BEZ JAKIEJKOLWIEK GWARANCJI. Szczegó³y w I</usr/share/doc/"
+#~ "dpkg/copyright> oraz w I</usr/share/common-licences/GPL>."
+
+# type: Plain text
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2000 Wichert Akkerman"
+
+# type: Plain text
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Copyright 1994 Ian Jackson. B<install-info> jest oprogramowaniem wolnym, "
+#~ "sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub "
+#~ "pó¼niejszej, by dowiedzieæ siê o warunkach dystrybucji. Brak "
+#~ "I<JAKIEJKOLWIEK> gwarancji."
+
+# type: Plain text
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Copyright 1995 Ian Jackson. Niniejszy program jest oprogramowaniem "
+#~ "wolnym, sprawd¼ Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub "
+#~ "pó¼niejszej, by dowiedzieæ siê o warunkach dystrybucji. Brak "
+#~ "JAKIEJKOLWIEK gwarancji."
+
+# type: Plain text
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Tê stronê podrêcznika napisa³ w 1997/98 Charles Briscoe-Smith. Niniejsza "
+#~ "dokumentacja jest oprogramowaniem wolnym, sprawd¼ Powszechn± Licencjê "
+#~ "Publiczn± GNU w wersji drugiej lub pó¼niejszej, by dowiedzieæ siê o "
+#~ "warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
+
+# type: Plain text
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "W ka¿dym systemie Debiana GNU GPL mo¿na znale¼æ w pliku /usr/share/common-"
+#~ "licenses/GPL."
+
 # type: TH
 #~ msgid "2006-04-09"
 #~ msgstr "2006-04-09"
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index b3877be2..6071ba8c 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -170,9 +170,9 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, fuzzy, no-wrap
@@ -188,15 +188,16 @@ msgstr ""
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
@@ -211,9 +212,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
@@ -235,11 +237,15 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2007-03-06"
+msgid "2007-07-18"
 msgstr "2006-04-09"
 
 # type: Plain text
@@ -302,19 +308,20 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -325,25 +332,25 @@ msgid "Show the usage message and exit."
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -354,13 +361,12 @@ msgstr ""
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
@@ -390,17 +396,23 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
 "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
@@ -1094,19 +1106,6 @@ msgstr "B<dpkg-deb-actions>"
 msgid "deb-substvars"
 msgstr "B<deinstall>"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2006-04-09"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1344,7 +1343,7 @@ msgid "List of substitution variables and values."
 msgstr "Lista dos pacotes disponíveis."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1361,47 +1360,23 @@ msgstr ""
 "reconfigure>(8)"
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
-"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
-"condições de cópia. NÂO existe garantia."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1715,8 +1690,8 @@ msgstr "A
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
@@ -1791,8 +1766,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<arquivo_do_pacote> ..."
 
 # type: Plain text
@@ -1808,8 +1783,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1847,8 +1822,8 @@ msgstr "B<2.> O script I<postinst>, se existir no pacote, 
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<pacote> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1897,8 +1872,8 @@ msgstr "B<3.> O script I<postrm> 
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<arquivo-Packages>"
 
 # type: Plain text
@@ -1929,8 +1904,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
 
 # type: Plain text
@@ -1948,8 +1923,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -1960,8 +1935,8 @@ msgstr "Despreza informa
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -1972,9 +1947,9 @@ msgstr "Apaga as informa
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -1988,8 +1963,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
@@ -2002,8 +1977,8 @@ msgstr "Obt
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2019,7 +1994,7 @@ msgstr "Configura as sele
 # type: TP
 #: ../../man/dpkg.1:206
 #, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2032,8 +2007,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2048,8 +2023,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2062,8 +2037,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2091,15 +2066,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2108,12 +2083,6 @@ msgstr ""
 "através do descritor de arquivo, não são redefinidas para comandos "
 "subseqüentes usados durante a mesma execução."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2121,8 +2090,8 @@ msgstr "Exibe uma breve mensagem de ajuda."
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2132,9 +2101,9 @@ msgstr "Ajuda com as op
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2144,8 +2113,8 @@ msgstr "Ajuda com as op
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
 msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
@@ -2153,12 +2122,6 @@ msgstr "B<dpkg --licence> | B<dpkg --license>"
 msgid "Display B<dpkg> licence."
 msgstr "Exibe a licença do B<dpkg>."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2180,24 +2143,24 @@ msgstr "Veja B<dpkg-deb>(1) para mais informa
 #: ../../man/dpkg.1:273
 #, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<diretório> [I<nome_de_arquivo>]\n"
 "    Cria um pacote deb.\n"
@@ -2228,19 +2191,20 @@ msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:291
+#: ../../man/dpkg.1:292
 #, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<padrão-do-nome-do-pacote> ...    Lista os pacotes que combinam com o padrão dado.\n"
 "B<dpkg -s> | B<--status> I<nome-do-pacote> ...\n"
@@ -2253,7 +2217,7 @@ msgstr ""
 "    Exibe detalhes sobre o I<pacote>, como encontrados em I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 #, fuzzy
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
@@ -2267,25 +2231,25 @@ msgstr ""
 "comando, mas sem os hífens)  ou um comentário (se começar com uma B<#>)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<número>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr "Altera o número de erros após os quais o dpkg abortará. O padrão é 50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 #, fuzzy
 msgid ""
 "When a package is removed, there is a possibility that another installed "
@@ -2298,13 +2262,13 @@ msgstr ""
 "que depende do que foi removido será automaticamente desconfigurado."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 #, fuzzy
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
@@ -2317,7 +2281,7 @@ msgstr ""
 "valores."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, fuzzy, no-wrap
 msgid ""
 " number  description\n"
@@ -2345,13 +2309,13 @@ msgstr ""
 " 2000   Quantidades insanas de saída.\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<coisas> | B<--no-force->I<coisas> | B<--refuse->I<coisas>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 #, fuzzy
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
@@ -2365,7 +2329,7 @@ msgstr ""
 "Coisas marcadas com (*) são forçadas por padrão."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 #, fuzzy
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
@@ -2377,13 +2341,13 @@ msgstr ""
 "sistema.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Liga (ou desliga) todas as opções de força."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 #, fuzzy
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
@@ -2393,7 +2357,7 @@ msgstr ""
 "instalada."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2403,7 +2367,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 #, fuzzy
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
@@ -2413,12 +2377,12 @@ msgstr ""
 "pacote atual dependa."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Processa pacotes mesmo quando marcados com \"hold\"."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 #, fuzzy
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
@@ -2430,7 +2394,7 @@ msgstr ""
 "pacote permaneçam em seu sistema, que serão então esquecidas pelo B<dpkg>."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 #, fuzzy
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
@@ -2443,19 +2407,19 @@ msgstr ""
 "cuidado."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Converte todos os problemas de dependência em avisos."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Não verifica versões quando verificando dependências."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2464,7 +2428,7 @@ msgstr ""
 "pois geralmente causará a regravação de alguns arquivos."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 #, fuzzy
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
@@ -2475,7 +2439,7 @@ msgstr ""
 "será preservada."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 #, fuzzy
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
@@ -2487,7 +2451,7 @@ msgstr ""
 "especificada, quando a ação padrão é então preferida."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 #, fuzzy
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
@@ -2499,7 +2463,7 @@ msgstr ""
 "especificada, quando a ação padrão é então preferida."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 #, fuzzy
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
@@ -2513,18 +2477,18 @@ msgstr ""
 "sido dadas, quando será então usado isso para decidir a ação final."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite>: Sobrescreve um arquivo do pacote com arquivo de outro."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir> Sobrescreve um diretório do pacote com arquivo de outro."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 #, fuzzy
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
@@ -2533,12 +2497,12 @@ msgstr ""
 "desviada."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Processa até pacotes com a arquitetura errada."
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2546,23 +2510,23 @@ msgstr ""
 "problemas."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root>: Tenta (des)instalar coisas mesmo não sendo root."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<pacote>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 #, fuzzy
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
@@ -2573,13 +2537,13 @@ msgstr ""
 "mais)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 #, fuzzy
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
@@ -2588,13 +2552,13 @@ msgstr ""
 "B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, fuzzy
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
@@ -2604,13 +2568,13 @@ msgstr ""
 "pacote. Isto é uma opção do B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 #, fuzzy, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 #, fuzzy
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
@@ -2621,7 +2585,7 @@ msgstr ""
 "é usado para ver o que acontece com a ação especificada, sem modificar nada."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 #, fuzzy
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
@@ -2635,13 +2599,13 @@ msgstr ""
 "no-act, apesar de que você esperava que nada fosse feito)"
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, fuzzy
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
@@ -2654,13 +2618,13 @@ msgstr ""
 "B<--unpack> e B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 #, fuzzy
 msgid ""
 "Don't install a package if a newer version of the same package is already "
@@ -2670,23 +2634,35 @@ msgstr ""
 "instalada. Isso é um apelido de B<--refuse-downgrade.>"
 
 # type: TP
-#: ../../man/dpkg.1:452
-#, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
+#, fuzzy, no-wrap
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir> I<diretório>"
+
+# type: Plain text
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir> I<diretório>"
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:465
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Muda os diretórios padrões.  O B<admindir> padrão é I</var/lib/dpkg> e "
 "contém muitos arquivos que dão informações sobre o estado dos pacotes "
@@ -2698,13 +2674,26 @@ msgstr ""
 "B<admindir> para I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:465
 #, fuzzy, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir> I<diretório>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
+msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
 #, fuzzy
 msgid ""
 "Only process the packages that are selected for installation. The actual "
@@ -2718,13 +2707,13 @@ msgstr ""
 "instalação."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, fuzzy
 msgid ""
 "Don't install the package if the same version of the package is already "
@@ -2732,13 +2721,13 @@ msgid ""
 msgstr "Não instala o pacote se a mesma versão dele já estiver instalada."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
@@ -2753,13 +2742,13 @@ msgstr ""
 "estado são da forma `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'."
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2773,40 +2762,40 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Arquivo de configuração com as opções padrões."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, fuzzy, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, fuzzy
 msgid ""
 "The other files listed below are in their default directories, see option "
@@ -2816,24 +2805,24 @@ msgstr ""
 "opção B<--admindir> para ver como alterar a localização desses arquivos."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Lista dos pacotes disponíveis."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 #, fuzzy
 msgid ""
 "Statuses of available packages. This file contains information about whether "
@@ -2845,7 +2834,7 @@ msgstr ""
 "Veja a seção B<INFORMAÇÃO SOBRE PACOTES> para maiores informações."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, fuzzy
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
@@ -2855,55 +2844,55 @@ msgstr ""
 "para mais informações sobre eles:"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "VARIÁVEIS DE AMBIENTE"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, fuzzy
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
@@ -2913,26 +2902,26 @@ msgstr ""
 "shell ao invés de suspender a si próprio, quando fazendo um escape de shell."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 #, fuzzy
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 #, fuzzy
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
@@ -2942,7 +2931,7 @@ msgstr ""
 "texto formatado. Atualmente só usado por -l."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -2950,53 +2939,53 @@ msgid "EXAMPLES"
 msgstr "EXEMPLOS"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Para listar os pacotes relacionados com o editor vi:"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, fuzzy, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 #, fuzzy
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "Para ver as entradas em I</var/lib/dpkg/available> em dois pacotes:"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, fuzzy, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "Para procurar na lista de pacotes você mesmo:"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, fuzzy, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "Para remover um pacote instalado elvis:"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, fuzzy, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 #, fuzzy
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
@@ -3007,7 +2996,7 @@ msgstr ""
 "\"editors\":"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3015,25 +3004,25 @@ msgid ""
 msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "Para fazer uma cópia local dos estados de seleção dos pacotes:"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, fuzzy, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "B< dpkg --get-selections E<gt>myselections>"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 "Você pode transferir esse arquivo para outro computador e instalá-lo com:"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, fuzzy, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3041,20 +3030,20 @@ msgid ""
 msgstr "B< dpkg --set-selections E<lt>myselections>"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
 #, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Note que isso não instalará nem removerá nada, mas apenas irá configurar o "
 "estado de seleção dos pacotes requisitados.  Você precisará de alguma outra "
 "aplicação para baixar e instalar os pacotes requisitados."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 #, fuzzy
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
@@ -3064,20 +3053,20 @@ msgstr ""
 "conveniente de modificar o estado de seleção dos pacotes."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 #, fuzzy
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
@@ -3087,22 +3076,22 @@ msgstr ""
 "reconfigure>(8)"
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> normalmente dá menos informação do que seria útil."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3117,6 +3106,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -3863,7 +3858,7 @@ msgstr "B<-G>"
 #: ../../man/dpkg-buildpackage.1:19
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 
 # type: TP
@@ -3880,7 +3875,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<-G>"
@@ -3891,57 +3886,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, fuzzy, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -3949,39 +3944,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -3989,13 +3984,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4003,86 +3998,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy, no-wrap
 msgid "B<-tc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4097,13 +4092,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4115,69 +4110,62 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, fuzzy, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir> I<diretório>"
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4185,8 +4173,8 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4196,14 +4184,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4259,7 +4247,7 @@ msgstr "B<-G>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr ""
 
 # type: UR
@@ -4270,7 +4258,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr ""
 
 # type: TH
@@ -4311,7 +4299,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4325,7 +4313,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
 msgid "B<debian/files>"
@@ -4427,7 +4415,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
@@ -4468,9 +4456,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-deb.1:101
-#, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:104
@@ -4568,7 +4556,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
@@ -4729,15 +4717,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -4765,8 +4744,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -4991,19 +4970,19 @@ msgstr "I</var/lib/dpkg/status>"
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -5031,65 +5010,58 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr ""
+#: ../../man/dpkg-genchanges.1:18
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5097,74 +5069,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<--new> | B<--old>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5172,21 +5124,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5195,13 +5147,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5209,13 +5161,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5223,7 +5175,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5235,6 +5187,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "I<control>"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5539,16 +5498,9 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-#, fuzzy
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+msgid "Copyright 1995,1996 Erick Branderhorst"
 msgstr ""
-"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
-"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
-"condições de cópia. NÂO existe garantia."
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -5628,7 +5580,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
@@ -5660,7 +5612,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
@@ -5676,7 +5628,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
@@ -5689,20 +5641,20 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
@@ -5716,7 +5668,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
@@ -5828,7 +5780,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
+msgid "Copyright (C) 2001 Wichert Akkerman"
 msgstr ""
 
 # type: UR
@@ -6407,117 +6359,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-G>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-G>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--list> I<ligação>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6525,7 +6525,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
@@ -6915,15 +6915,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7067,11 +7058,6 @@ msgid ""
 "extension \"-old\", before replacing it with the new one."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr ""
-
 # type: TH
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -8412,16 +8398,9 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/install-info.8:297
-#, fuzzy
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+msgid "Copyright 1994 Ian Jackson"
 msgstr ""
-"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
-"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
-"condições de cópia. NÂO existe garantia."
 
 # type: TH
 #: ../../man/start-stop-daemon.8:1
@@ -9200,7 +9179,7 @@ msgstr ""
 # type: TP
 #: ../../man/update-alternatives.8:204
 #, fuzzy, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr "B<--install> I<ligação genérico caminho pri> [B<--slave> I<sligação sgenérico scaminho>] ..."
 
 # type: Plain text
@@ -9580,44 +9559,113 @@ msgstr ""
 "na documentação; por favor reporte isso."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
+msgstr ""
+
+# type: Plain text
+#: ../../man/update-alternatives.8:402
 #, fuzzy
 msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
 "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
 "condições de cópia. NÂO existe garantia."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:400
+#: ../../man/update-alternatives.8:405
 #, fuzzy
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
-msgstr ""
-"Esta página de manual é copyright 1997/98 Charles Briscoe-Smith.  Isto é "
-"documentação livre; veja a Licença Pública Geral GNU versão 2 ou posterior "
-"para condições de cópia. NÂO existe garantia."
+msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
+msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:402
 #, fuzzy
-msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
-msgstr ""
-"Você pode encontrar a GNU GPL em /usr/share/common-licenses/GPL em qualquer "
-"sistema Debian."
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+#~ "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+#~ "condições de cópia. NÂO existe garantia."
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 
 # type: Plain text
-#: ../../man/update-alternatives.8:405
 #, fuzzy
-msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
-msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+#~ "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+#~ "condições de cópia. NÂO existe garantia."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+#~ "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+#~ "condições de cópia. NÂO existe garantia."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+#~ "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+#~ "condições de cópia. NÂO existe garantia."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Esta página de manual é copyright 1997/98 Charles Briscoe-Smith.  Isto é "
+#~ "documentação livre; veja a Licença Pública Geral GNU versão 2 ou "
+#~ "posterior para condições de cópia. NÂO existe garantia."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+#~ "system."
+#~ msgstr ""
+#~ "Você pode encontrar a GNU GPL em /usr/share/common-licenses/GPL em "
+#~ "qualquer sistema Debian."
 
 # type: TH
 #~ msgid "2006-04-09"
@@ -9774,11 +9822,6 @@ msgstr "B<ln>(1), FHS, o Padr
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg -C> | B<--audit>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--list> I<ligação>"
-
 # type: TP
 #, fuzzy
 #~ msgid "B<--join>, B<-j>"
diff --git a/man/po/ru.po b/man/po/ru.po
index e74e3ed0..4adcd3ac 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2006-04-08 13:50+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -152,7 +152,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -175,9 +175,9 @@ msgstr "B<822-date> не использует аргументов или пар
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -193,15 +193,16 @@ msgstr "На самом деле эту задачу должна выполня
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -220,9 +221,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "АВТОР"
@@ -244,11 +246,15 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2007-03-06"
+msgid "2007-07-18"
 msgstr "2006-02-28"
 
 # type: Plain text
@@ -311,19 +317,20 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<dpkg --help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -334,25 +341,25 @@ msgid "Show the usage message and exit."
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<dpkg --version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -364,13 +371,12 @@ msgstr "Выдать информацию о версии и завершить
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ФАЙЛЫ"
@@ -400,16 +406,23 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
 "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
@@ -1221,19 +1234,6 @@ msgstr "B<dpkg-deb-actions>"
 msgid "deb-substvars"
 msgstr "B<deinstall>"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1471,7 +1471,7 @@ msgid "List of substitution variables and values."
 msgstr "Список доступных пакетов."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1486,47 +1486,23 @@ msgid ""
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1825,8 +1801,8 @@ msgstr "ДЕЙСТВИЯ"
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
@@ -1895,8 +1871,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<имя файла пакета>..."
 
 # type: Plain text
@@ -1910,8 +1886,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1946,8 +1922,8 @@ msgstr "B<2.> Запуск сценария I<postinst>, если он есть
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<имя пакета> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1993,8 +1969,8 @@ msgstr "B<3.> Запуск сценария I<postrm>"
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail > I <файл Packages>"
 
 # type: Plain text
@@ -2025,8 +2001,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
 
 # type: Plain text
@@ -2042,8 +2018,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2053,8 +2029,8 @@ msgstr "Забыть о неустановленных недоступных п
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2064,9 +2040,9 @@ msgstr "Очистить имеющуюся информацию о том, ка
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2079,8 +2055,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
@@ -2094,8 +2070,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2114,7 +2090,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg.1:206
 #, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2127,8 +2103,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2142,8 +2118,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2157,8 +2133,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2185,14 +2161,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2201,12 +2178,6 @@ msgstr ""
 "через этот дескриптор, не сбрасываются для последующих команд, выполняющихся "
 "далее в этом запуске."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2214,8 +2185,8 @@ msgstr "Вывести небольшую подсказку."
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2225,9 +2196,9 @@ msgstr "Вывести подсказку о параметрах B<--force->I<
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2236,8 +2207,8 @@ msgstr "Вывести подсказку о параметрах отладки
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
 msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
@@ -2245,12 +2216,6 @@ msgstr "B<dpkg --licence> | B<dpkg --license>"
 msgid "Display B<dpkg> licence."
 msgstr "Показать лицензию B<dpkg>."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2271,26 +2236,26 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<каталог> [I<имя файла>]\n"
 "    Собирает deb пакет.\n"
@@ -2324,19 +2289,20 @@ msgstr ""
 "действиях."
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list > I<шаблон имени пакета> ...\n"
 "    Показывает пакеты, соответствующие данному шаблону.\n"
@@ -2351,7 +2317,7 @@ msgstr ""
 "    из файла I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2365,13 +2331,13 @@ msgstr ""
 "начинается с B<#>)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<число>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
@@ -2379,13 +2345,13 @@ msgstr ""
 "умолчанию 50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2397,13 +2363,13 @@ msgstr ""
 "автоматической деконфигурации пакета, который зависит от удаляемого пакета."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 #, fuzzy
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
@@ -2416,7 +2382,7 @@ msgstr ""
 "эти отладочные значения."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2444,13 +2410,13 @@ msgstr ""
 " 2000   Невероятное количество ерунды\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2464,7 +2430,7 @@ msgstr ""
 "выполняются по умолчанию."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2475,13 +2441,13 @@ msgstr ""
 "работоспособность всей системы.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Включить (или выключить) все принудительные параметры."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2490,7 +2456,7 @@ msgstr ""
 "версия."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2506,7 +2472,7 @@ msgstr ""
 "Использовать осторожно.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2515,12 +2481,12 @@ msgstr ""
 "пакеты, от которых зависит текущий пакет."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Обрабатывать даже пакеты, помеченные как \"зафиксированные\"."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2531,7 +2497,7 @@ msgstr ""
 "пакета останутся в системе, а B<dpkg> про них забудет."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2543,19 +2509,19 @@ msgstr ""
 "работоспособности системы, так что используйте данный параметр осторожно."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Превратить проблемы с зависимостями в предупреждения."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Не обращать внимание на версии при проверке зависимостей."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2564,7 +2530,7 @@ msgstr ""
 "опасно, так как обычно приводит к перезаписи некоторых файлов."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2573,7 +2539,7 @@ msgstr ""
 "опасно, так как не будут сохранены изменения (удаление) файла."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2584,7 +2550,7 @@ msgstr ""
 "force-confdef>, при котором предпочтение отдаётся действию по умолчанию."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2595,7 +2561,7 @@ msgstr ""
 "confdef>, при котором предпочтение отдаётся действию по умолчанию."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2609,19 +2575,19 @@ msgstr ""
 "делать)."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Перезаписать файл из одного пакета файлом из другого пакета."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: Перезаписать каталог из одного пакета файлом из другого."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2629,12 +2595,12 @@ msgstr ""
 "(diverted) его неизменённой версией."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Обрабатывать даже пакеты с неправильной архитектурой."
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2642,27 +2608,27 @@ msgstr ""
 "возникнуть проблемы."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Попытаться установить или удалить пакет, даже если не нет прав "
 "суперпользователя."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Устанавливать пакет, даже если он не прошёл проверку "
 "подлинности."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<пакет>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2672,13 +2638,13 @@ msgstr ""
 "ничего более)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2686,13 +2652,13 @@ msgstr ""
 "программы B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2701,13 +2667,13 @@ msgstr ""
 "параметр программы B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2718,7 +2684,7 @@ msgstr ""
 "указанного действия, но при этом ничего не меняется."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2731,13 +2697,13 @@ msgstr ""
 "удалить пакет --no-act, хотя вы ожидали, что ничего выполнено не будет)"
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2749,13 +2715,13 @@ msgstr ""
 "B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 #, fuzzy
 msgid ""
 "Don't install a package if a newer version of the same package is already "
@@ -2765,23 +2731,35 @@ msgstr ""
 "Это синоним параметра B<--refuse-downgrade>."
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<--admindir=>I<dir>"
+msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Изменить каталоги по умолчанию. Каталог B<admindir> по умолчанию имеет "
 "значение B</var/lib/dpkg> и содержит много файлов, в которых даётся "
@@ -2794,14 +2772,27 @@ msgstr ""
 "-- в значение I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2812,13 +2803,13 @@ msgstr ""
 "Например, когда пакет удаляется, он будет помечен для удаления."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2826,13 +2817,13 @@ msgstr ""
 "Не устанавливать пакет, если та же версия этого пакета уже установлена."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
@@ -2850,13 +2841,13 @@ msgstr ""
 "conffile : 'current-conffile' 'new-conffile' useredited distedited'"
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, fuzzy
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
@@ -2882,42 +2873,42 @@ msgstr ""
 "где I<E<lt>decision> может быть install или keep."
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "Не пытаться проверять подпись пакета."
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Файл конфигурации с параметрами по умолчанию."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "Файл журнала по умолчанию (смотрите I</etc/dpkg/dpkg.cfg>(5) и параметр B<--"
 "log>)."
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -2926,24 +2917,24 @@ msgstr ""
 "параметр B<admindir>, чтобы узнать, как изменить местоположение этих файлов."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Список доступных пакетов."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2954,7 +2945,7 @@ msgstr ""
 "B<ИНФОРМАЦИЯ О ПАКЕТАХ>, где приведена подробная информация."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -2963,55 +2954,55 @@ msgstr ""
 "(5), где приведена подробная информация:"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3020,25 +3011,25 @@ msgstr ""
 "себя, а создаёт новый процесс."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 #, fuzzy
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3048,7 +3039,7 @@ msgstr ""
 "B<-l>."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3056,53 +3047,53 @@ msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Показать список пакетов, относящихся к редактору vi:"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, fuzzy, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 #, fuzzy
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "Посмотреть записи о двух пакетах в файле B</var/lib/dpkg/available>:"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, fuzzy, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "Вручную просмотреть список пакетов:"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, fuzzy, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "Удалить установленный пакет elvis:"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, fuzzy, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3112,7 +3103,7 @@ msgstr ""
 "\" (\"редакторы\"):"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3120,18 +3111,18 @@ msgid ""
 msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "Получить локальную копию состояний выбранных пакетов:"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, fuzzy, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "B< dpkg --get-selections E<gt>myselections>"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3139,7 +3130,7 @@ msgstr ""
 "помощью:"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, fuzzy, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3147,12 +3138,13 @@ msgid ""
 msgstr "B< dpkg --set-selections E<lt>myselections>"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Заметим, что при этом ничего не будет ни установлено, ни удалено, просто "
 "будут заданы состояния запрошенных пакетов. Для того, чтобы на самом деле "
@@ -3160,7 +3152,7 @@ msgstr ""
 "Например, запустите B<dselect> и выберите \"Установить\"."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3169,22 +3161,23 @@ msgstr ""
 "выбранных пакетов."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "Дополнительная функциональность может быть получена установкой любых "
 "следующих пакетов: I<apt>, I<aptitude> и I<debsums>."
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3193,22 +3186,22 @@ msgstr ""
 "(5), B<dpkg.cfg>(5) и B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "АВТОРЫ"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3221,6 +3214,12 @@ msgstr "Смотрите файл I</usr/share/doc/dpkg/THANKS>, где прив
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -3969,7 +3968,7 @@ msgstr "B<-B>"
 #: ../../man/dpkg-buildpackage.1:19
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
+"distributed."
 msgstr ""
 
 # type: TP
@@ -3986,7 +3985,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<-G>"
@@ -3997,57 +3996,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, fuzzy, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4055,39 +4054,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, fuzzy, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B< >E<lt>длинное описаниеE<gt>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4095,13 +4094,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4109,88 +4108,88 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 #, fuzzy
 msgid "Do not check build dependencies and conflicts."
 msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy, no-wrap
 msgid "B<-tc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4205,13 +4204,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4223,69 +4222,62 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 msgid "Do not sign the source package."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr ""
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4293,8 +4285,8 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4304,14 +4296,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4373,7 +4365,8 @@ msgstr "B<-B>"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
-msgid "Copyright 2001 Joey Hess"
+#, fuzzy
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -4384,7 +4377,8 @@ msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TH
@@ -4425,7 +4419,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4439,7 +4433,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
 msgid "B<debian/files>"
@@ -4543,7 +4537,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
 
 # type: Plain text
@@ -4585,7 +4579,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
 #, fuzzy, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
 
 # type: Plain text
@@ -4683,9 +4677,9 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-deb.1:151
-#, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
+msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 # type: Plain text
 #: ../../man/dpkg-deb.1:155
@@ -4846,15 +4840,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, no-wrap
@@ -4882,8 +4867,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5108,19 +5093,19 @@ msgstr "I</var/lib/dpkg/status>"
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -5148,65 +5133,58 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-s>|B<--signal> I<сигнал>"
+msgid "B<-b>, B<-B>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5214,74 +5192,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-t>|B<--test>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5289,21 +5247,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5312,13 +5270,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5326,13 +5284,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5340,7 +5298,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5352,6 +5310,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "deb-control"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5657,16 +5622,9 @@ msgid ""
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-#, fuzzy
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+msgid "Copyright 1995,1996 Erick Branderhorst"
 msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -5746,7 +5704,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
@@ -5778,7 +5736,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
@@ -5794,7 +5752,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 # type: Plain text
@@ -5807,20 +5765,20 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: TP
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
@@ -5834,7 +5792,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-n>|B<--name> I<имя_процесса>"
 
 # type: Plain text
@@ -5947,7 +5905,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-query.1:151
 #, fuzzy
-msgid "Copyright 2001 Wichert Akkerman"
+msgid "Copyright (C) 2001 Wichert Akkerman"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
@@ -6526,117 +6484,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-B>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<-t>|B<--test>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6644,7 +6650,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -7033,15 +7039,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7185,12 +7182,6 @@ msgid ""
 "extension \"-old\", before replacing it with the new one."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-#, fuzzy
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2001 Joey Hess"
-
 # type: TH
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -8536,16 +8527,9 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/install-info.8:297
-#, fuzzy
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+msgid "Copyright 1994 Ian Jackson"
 msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -9318,7 +9302,7 @@ msgstr ""
 # type: TP
 #: ../../man/update-alternatives.8:204
 #, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr ""
 
 # type: Plain text
@@ -9622,41 +9606,113 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-#, fuzzy
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:400
+#: ../../man/update-alternatives.8:402
 #, fuzzy
 msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
 "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
 "гарантий."
 
-# type: Plain text
-#: ../../man/update-alternatives.8:402
-msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
-msgstr ""
-
 # type: Plain text
 #: ../../man/update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<-s>|B<--signal> I<сигнал>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Copyright 2001 Joey Hess"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
 # type: TH
 #, fuzzy
 #~ msgid "2006-04-09"
@@ -9854,11 +9910,6 @@ msgstr ""
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg -C> | B<--audit>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<-t>|B<--test>"
-
 # type: TP
 #, fuzzy
 #~ msgid "B<--join>, B<-j>"
diff --git a/man/po/sv.po b/man/po/sv.po
index 5ffbba71..c7cfbd89 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-07-01 15:48+0200\n"
+"POT-Creation-Date: 2007-07-21 16:13+0300\n"
 "PO-Revision-Date: 2006-05-14 16:18+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:293
+#: ../../man/822-date.1:20 ../../man/cleanup-info.8:30 ../../man/dpkg.1:294
 #: ../../man/dpkg-architecture.1:68 ../../man/dpkg-buildpackage.1:14
 #: ../../man/dpkg-checkbuilddeps.1:18 ../../man/dpkg-distaddfile.1:27
 #: ../../man/dpkg-deb.1:172 ../../man/dpkg-divert.8:38
@@ -177,9 +177,9 @@ msgstr "B<822-date> tar inga flaggor eller parametrar."
 
 # type: SH
 #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48
-#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:609
-#: ../../man/dpkg-buildpackage.1:181 ../../man/dpkg-deb.1:221
-#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:241
+#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615
+#: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221
+#: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231
 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427
 #: ../../man/update-alternatives.8:383
 #, no-wrap
@@ -195,15 +195,16 @@ msgstr "Denna funktion borde ing
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
 #: ../../man/deb-control.5:206 ../../man/deb-old.5:51
 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:599
+#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605
 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
-#: ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158
-#: ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65
-#: ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:252
-#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
-#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
-#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
+#: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238
+#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97
+#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95
+#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127
+#: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226
+#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
+#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
+#: ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE ÄVEN"
@@ -218,9 +219,10 @@ msgstr ""
 #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272
 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31
 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121
-#: ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69
-#: ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81
-#: ../../man/dselect.cfg.5:17 ../../man/update-alternatives.8:392
+#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149
+#: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232
+#: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17
+#: ../../man/install-info.8:291 ../../man/update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "FÖRFATTARE"
@@ -242,12 +244,16 @@ msgid "cleanup-info"
 msgstr ""
 
 # type: TH
-#: ../../man/cleanup-info.8:1 ../../man/dpkg-architecture.1:1
-#: ../../man/dpkg-name.1:6 ../../man/dpkg-query.1:1 ../../man/dpkg-split.1:2
-#: ../../man/start-stop-daemon.8:1
+#: ../../man/cleanup-info.8:1 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
+#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
+#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-name.1:6
+#: ../../man/dpkg-query.1:1 ../../man/dpkg-source.1:2 ../../man/dpkg-split.1:2
+#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
+#: ../../man/update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2007-03-06"
-msgstr "2006-04-09"
+msgid "2007-07-18"
+msgstr "2006-05-10"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:4
@@ -309,19 +315,20 @@ msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: ../../man/cleanup-info.8:36 ../../man/dpkg-architecture.1:61
-#: ../../man/dpkg-divert.8:67 ../../man/dpkg-scansources.1:60
-#: ../../man/dpkg-statoverride.8:44 ../../man/dselect.1:121
-#: ../../man/install-info.8:205 ../../man/update-alternatives.8:295
+#: ../../man/cleanup-info.8:36 ../../man/dpkg.1:235
+#: ../../man/dpkg-architecture.1:61 ../../man/dpkg-divert.8:67
+#: ../../man/dpkg-scansources.1:60 ../../man/dpkg-statoverride.8:44
+#: ../../man/dselect.1:121 ../../man/install-info.8:205
+#: ../../man/update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-checkbuilddeps.1:30
+#: ../../man/dpkg-buildpackage.1:175 ../../man/dpkg-checkbuilddeps.1:30
 #: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
-#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:142
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
 #: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-name.1:59
 #: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
 #: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
@@ -333,25 +340,25 @@ msgid "Show the usage message and exit."
 msgstr "Visar en kort hjälptext och ger lyckat avslut."
 
 # type: TP
-#: ../../man/cleanup-info.8:39 ../../man/dpkg-architecture.1:64
-#: ../../man/dpkg-buildpackage.1:177 ../../man/dpkg-distaddfile.1:35
-#: ../../man/dpkg-deb.1:165 ../../man/dpkg-divert.8:70
-#: ../../man/dpkg-genchanges.1:142 ../../man/dpkg-gencontrol.1:101
-#: ../../man/dpkg-parsechangelog.1:36 ../../man/dpkg-query.1:62
-#: ../../man/dpkg-scanpackages.1:84 ../../man/dpkg-scansources.1:62
-#: ../../man/dpkg-shlibdeps.1:112 ../../man/dpkg-source.1:61
-#: ../../man/dpkg-split.1:130 ../../man/dpkg-statoverride.8:47
-#: ../../man/dselect.1:128 ../../man/install-info.8:210
-#: ../../man/update-alternatives.8:298
+#: ../../man/cleanup-info.8:39 ../../man/dpkg.1:247
+#: ../../man/dpkg-architecture.1:64 ../../man/dpkg-buildpackage.1:175
+#: ../../man/dpkg-distaddfile.1:35 ../../man/dpkg-deb.1:165
+#: ../../man/dpkg-divert.8:70 ../../man/dpkg-genchanges.1:130
+#: ../../man/dpkg-gencontrol.1:101 ../../man/dpkg-parsechangelog.1:36
+#: ../../man/dpkg-query.1:62 ../../man/dpkg-scanpackages.1:84
+#: ../../man/dpkg-scansources.1:62 ../../man/dpkg-shlibdeps.1:112
+#: ../../man/dpkg-source.1:61 ../../man/dpkg-split.1:130
+#: ../../man/dpkg-statoverride.8:47 ../../man/dselect.1:128
+#: ../../man/install-info.8:210 ../../man/update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #: ../../man/cleanup-info.8:42 ../../man/dpkg-architecture.1:67
-#: ../../man/dpkg-buildpackage.1:180 ../../man/dpkg-distaddfile.1:38
+#: ../../man/dpkg-buildpackage.1:178 ../../man/dpkg-distaddfile.1:38
 #: ../../man/dpkg-deb.1:168 ../../man/dpkg-divert.8:73
-#: ../../man/dpkg-genchanges.1:145 ../../man/dpkg-gencontrol.1:104
+#: ../../man/dpkg-genchanges.1:133 ../../man/dpkg-gencontrol.1:104
 #: ../../man/dpkg-name.1:62 ../../man/dpkg-parsechangelog.1:39
 #: ../../man/dpkg-query.1:65 ../../man/dpkg-scanpackages.1:87
 #: ../../man/dpkg-scansources.1:64 ../../man/dpkg-shlibdeps.1:115
@@ -363,13 +370,12 @@ msgstr "Skriv ut versionsinformation och avsluta sedan."
 
 # type: SH
 #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120
-#: ../../man/dpkg.1:496 ../../man/dpkg.cfg.5:12
-#: ../../man/dpkg-buildpackage.1:186 ../../man/dpkg-distaddfile.1:39
-#: ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:146
-#: ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40
-#: ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215
-#: ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12
-#: ../../man/update-alternatives.8:325
+#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12
+#: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108
+#: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105
+#: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116
+#: ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68
+#: ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FILER"
@@ -399,16 +405,23 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/cleanup-info.8:56
-msgid "Copyright (C) 1996 Kim-Minh Kaplan."
+msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/dpkg-checkbuilddeps.1:38
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-query.1:157
-#: ../../man/dpkg-statoverride.8:88
+#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
+#: ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38
+#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
+#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
+#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109
+#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253
+#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88
+#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Detta är fri programvara; se GNU General Public License version 2 eller "
 "senare för kopieringsvillkor. Det finns INGEN garanti."
@@ -1268,19 +1281,6 @@ msgstr "B<dpkg-deb-
 msgid "deb-substvars"
 msgstr "B<ta bort>"
 
-# type: TH
-#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
-#: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
-#: ../../man/dpkg-deb.1:1 ../../man/dpkg-divert.8:1
-#: ../../man/dpkg-genchanges.1:1 ../../man/dpkg-gencontrol.1:1
-#: ../../man/dpkg-scanpackages.1:16 ../../man/dpkg-scansources.1:1
-#: ../../man/dpkg-shlibdeps.1:1 ../../man/dpkg-source.1:2
-#: ../../man/dpkg-statoverride.8:1 ../../man/install-info.8:5
-#: ../../man/update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2007-06-12"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: ../../man/deb-substvars.5:5
 msgid "deb-substvars - Debian source substitution variables"
@@ -1519,7 +1519,7 @@ msgid "List of substitution variables and values."
 msgstr "Lista över tillgängliga paket."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:244
+#: ../../man/deb-substvars.5:128 ../../man/dpkg-source.1:234
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1534,47 +1534,24 @@ msgid ""
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
-#: ../../man/deb-substvars.5:138
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: SH
-#: ../../man/deb-substvars.5:139 ../../man/dpkg-name.1:105
-#: ../../man/install-info.8:291
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: ../../man/deb-substvars.5:141 ../../man/dpkg-buildpackage.1:195
-#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-genchanges.1:158
-#: ../../man/dpkg-gencontrol.1:121 ../../man/dpkg-parsechangelog.1:50
-#: ../../man/dpkg-shlibdeps.1:132 ../../man/dpkg-source.1:259
+#: ../../man/deb-substvars.5:138 ../../man/dpkg-buildpackage.1:193
+#: ../../man/dpkg-distaddfile.1:49 ../../man/dpkg-deb.1:246
+#: ../../man/dpkg-genchanges.1:146 ../../man/dpkg-gencontrol.1:121
+#: ../../man/dpkg-parsechangelog.1:50 ../../man/dpkg-shlibdeps.1:132
+#: ../../man/dpkg-source.1:249 ../../man/dpkg-split.1:234
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-substvars.5:143 ../../man/dpkg-buildpackage.1:197
-#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:160
+#: ../../man/deb-substvars.5:140 ../../man/dpkg-buildpackage.1:195
+#: ../../man/dpkg-distaddfile.1:51 ../../man/dpkg-genchanges.1:148
 #: ../../man/dpkg-gencontrol.1:123 ../../man/dpkg-parsechangelog.1:52
-#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:261
+#: ../../man/dpkg-shlibdeps.1:134 ../../man/dpkg-source.1:251
+#: ../../man/dpkg-statoverride.8:83
 #, fuzzy
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
 
-# type: Plain text
-#: ../../man/deb-substvars.5:145 ../../man/dpkg-buildpackage.1:199
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-genchanges.1:162
-#: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-parsechangelog.1:54
-#: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:263
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY."
-msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
-
 # type: TH
 #: ../../man/dpkg.1:1
 #, no-wrap
@@ -1873,8 +1850,8 @@ msgstr "
 
 # type: TP
 #: ../../man/dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+#, fuzzy, no-wrap
+msgid "B<-i>, B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<paketfil>..."
 
 # type: Plain text
@@ -1943,8 +1920,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:124
-#, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<--unpack >I<package_file>..."
 msgstr "B<dpkg --unpack >I<paketfil> ..."
 
 # type: Plain text
@@ -1958,8 +1935,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -1993,8 +1970,8 @@ msgstr "B<2.> K
 
 # type: TP
 #: ../../man/dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
@@ -2039,8 +2016,8 @@ msgstr "B<3.> K
 
 # type: TP
 #: ../../man/dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#, fuzzy, no-wrap
+msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-fil>"
 
 # type: Plain text
@@ -2071,8 +2048,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#, fuzzy, no-wrap
+msgid "B<-A>, B<--record-avail> I<package_file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<paketfil> ..."
 
 # type: Plain text
@@ -2088,8 +2065,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+#, fuzzy, no-wrap
+msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
@@ -2099,8 +2076,8 @@ msgstr "Gl
 
 # type: TP
 #: ../../man/dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
+#, fuzzy, no-wrap
+msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
@@ -2110,9 +2087,9 @@ msgstr "Radera existerande information om vilka paket som 
 
 # type: TP
 #: ../../man/dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#, fuzzy, no-wrap
+msgid " B<-C>, B<--audit>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
 #: ../../man/dpkg.1:196
@@ -2125,8 +2102,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+#, fuzzy, no-wrap
+msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<mönster>...]"
 
 # type: Plain text
@@ -2140,8 +2117,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
+#, fuzzy, no-wrap
+msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2159,8 +2136,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
+#, fuzzy, no-wrap
+msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
@@ -2177,8 +2154,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+#, fuzzy, no-wrap
+msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
@@ -2192,8 +2169,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
+#, fuzzy, no-wrap
+msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
@@ -2206,8 +2183,8 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+#, fuzzy, no-wrap
+msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
@@ -2233,14 +2210,15 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+#, fuzzy, no-wrap
+msgid "B<--command-fd >I<E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #: ../../man/dpkg.1:235
+#, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
 "are not reset for subsequent commands executed during the same run."
 msgstr ""
@@ -2248,12 +2226,6 @@ msgstr ""
 "Flaggor som sätts på kommandoraden, och genom detta filhandtag, återställs "
 "inte för kommandon som körs i en följd under samma körning."
 
-# type: TP
-#: ../../man/dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
 # type: Plain text
 #: ../../man/dpkg.1:238
 msgid "Display a brief help message."
@@ -2261,8 +2233,8 @@ msgstr "Visar en kortfattad hj
 
 # type: TP
 #: ../../man/dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
+#, fuzzy, no-wrap
+msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
@@ -2272,9 +2244,9 @@ msgstr "Get hj
 
 # type: TP
 #: ../../man/dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+#, fuzzy, no-wrap
+msgid "B<-Dh>, B<--debug=help>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
 #: ../../man/dpkg.1:244
@@ -2283,21 +2255,15 @@ msgstr "Ger hj
 
 # type: TP
 #: ../../man/dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+#, fuzzy, no-wrap
+msgid "B<--licence>, B<--license>"
+msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #: ../../man/dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr "Visar B<dpkg>s licensvillkor."
 
-# type: TP
-#: ../../man/dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
 #: ../../man/dpkg.1:250
 msgid "Display B<dpkg> version information."
@@ -2316,26 +2282,26 @@ msgstr "Se B<dpkg-deb>(1) f
 
 # type: Plain text
 #: ../../man/dpkg.1:273
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
+"B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<filename> [I<directory>]\n"
 "    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"B<-X>, B<--vextract> I<archive directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+"B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
 "    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
+"B<--fsys-tarfile> I<archive>\n"
 "    Display the filesystem tar-file contained by a\n"
 "    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
 msgstr ""
 "B<dpkg -b> | B<--build> I<katalog> [I<filnamn>]\n"
 "    Bygg ett deb-paket.\n"
@@ -2366,19 +2332,20 @@ msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr "Se B<dpkg-query>(1) för ytterligare information om följande åtgärder:"
 
 # type: Plain text
-#: ../../man/dpkg.1:291
-#, no-wrap
+#: ../../man/dpkg.1:292
+#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"B<-l>, B<--list> I<package-name-pattern>...\n"
 "    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"B<-s>, B<--status> I<package-name>...\n"
 "    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"B<-L>, B<--listfiles> I<package-name>...\n"
+"    List files installed to your system from I<package-name>.\n"
+"B<-S>, B<--search> I<filename-search-pattern>...\n"
 "    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+"B<-p>, B<--print-avail> I<package-name>...\n"
+"    Display details about I<package-name>, as found in\n"
+"    I</var/lib/dpkg/available>.\n"
 msgstr ""
 "B<dpkg -l> | B<--list> I<paketnamnsmönster> ...\n"
 "    Lista paket som matchar det givna mönstret.\n"
@@ -2392,7 +2359,7 @@ msgstr ""
 "    Visa detaljer om I<paket>, som i I</var/lib/dpkg/available/>.\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:298
+#: ../../man/dpkg.1:299
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2405,25 +2372,25 @@ msgstr ""
 "bindestreck) eller en kommentar (om den börjar med ett B<#>)."
 
 # type: TP
-#: ../../man/dpkg.1:299
+#: ../../man/dpkg.1:300
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<antal>"
 
 # type: Plain text
-#: ../../man/dpkg.1:302
+#: ../../man/dpkg.1:303
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr "Ställer in efter hur många fel dpkg skall avbryta. Förvalet är 50."
 
 # type: TP
-#: ../../man/dpkg.1:302
-#, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+#: ../../man/dpkg.1:303
+#, fuzzy, no-wrap
+msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: ../../man/dpkg.1:308
+#: ../../man/dpkg.1:309
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2435,13 +2402,13 @@ msgstr ""
 "borttagna paketet automatiskt att avkonfigureras."
 
 # type: TP
-#: ../../man/dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+#: ../../man/dpkg.1:309
+#, fuzzy, no-wrap
+msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<oktalvärde>B< | --debug=>I<oktalvärde>"
 
 # type: Plain text
-#: ../../man/dpkg.1:314
+#: ../../man/dpkg.1:315
 #, fuzzy
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
@@ -2454,7 +2421,7 @@ msgstr ""
 "dessa felsökningsvärden."
 
 # type: Plain text
-#: ../../man/dpkg.1:326
+#: ../../man/dpkg.1:327
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2482,13 +2449,13 @@ msgstr ""
 " 2000   Knäppa mängder pladder\n"
 
 # type: TP
-#: ../../man/dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: ../../man/dpkg.1:327
+#, fuzzy, no-wrap
+msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<nånting> | B<--no-force->I<nånting> | B<--refuse->I<nånting>"
 
 # type: Plain text
-#: ../../man/dpkg.1:333
+#: ../../man/dpkg.1:334
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2501,7 +2468,7 @@ msgstr ""
 "är som förval tvingande."
 
 # type: Plain text
-#: ../../man/dpkg.1:337
+#: ../../man/dpkg.1:338
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2512,13 +2479,13 @@ msgstr ""
 "du förstöra din systeminstallation.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:340
+#: ../../man/dpkg.1:341
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Slår på (eller av) alla tvingande parametrar."
 
 # type: Plain text
-#: ../../man/dpkg.1:343
+#: ../../man/dpkg.1:344
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2527,7 +2494,7 @@ msgstr ""
 "installerad."
 
 # type: Plain text
-#: ../../man/dpkg.1:350
+#: ../../man/dpkg.1:351
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2542,7 +2509,7 @@ msgstr ""
 "instabilt. Använd med tillförsikt.>"
 
 # type: Plain text
-#: ../../man/dpkg.1:354
+#: ../../man/dpkg.1:355
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2551,12 +2518,12 @@ msgstr ""
 "på vilka det aktuella paketet beror."
 
 # type: Plain text
-#: ../../man/dpkg.1:357
+#: ../../man/dpkg.1:358
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Hantera även \"håll\"-markerade paket."
 
 # type: Plain text
-#: ../../man/dpkg.1:362
+#: ../../man/dpkg.1:363
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2567,7 +2534,7 @@ msgstr ""
 "delar av paketet blir kvar på systemet, men glöms bort av B<dpkg>."
 
 # type: Plain text
-#: ../../man/dpkg.1:367
+#: ../../man/dpkg.1:368
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2579,19 +2546,19 @@ msgstr ""
 "fungera, så använd med tillförsikt."
 
 # type: Plain text
-#: ../../man/dpkg.1:370
+#: ../../man/dpkg.1:371
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Gör alla beroendeproblem till varningar."
 
 # type: Plain text
-#: ../../man/dpkg.1:373
+#: ../../man/dpkg.1:374
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Ignorera versionsnummer när beroenden kontrolleras."
 
 # type: Plain text
-#: ../../man/dpkg.1:377
+#: ../../man/dpkg.1:378
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2601,7 +2568,7 @@ msgstr ""
 "filer skrivs över."
 
 # type: Plain text
-#: ../../man/dpkg.1:382
+#: ../../man/dpkg.1:383
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2610,7 +2577,7 @@ msgstr ""
 "farligt, eftersom det inte bibehåller ändringar (raderingar) av filer."
 
 # type: Plain text
-#: ../../man/dpkg.1:387
+#: ../../man/dpkg.1:388
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2621,7 +2588,7 @@ msgstr ""
 "det förvalda alternativet kommer att utföras."
 
 # type: Plain text
-#: ../../man/dpkg.1:392
+#: ../../man/dpkg.1:393
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2632,7 +2599,7 @@ msgstr ""
 "det förvalda alternativet kommer att utföras."
 
 # type: Plain text
-#: ../../man/dpkg.1:398
+#: ../../man/dpkg.1:399
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2645,17 +2612,17 @@ msgstr ""
 "också angetts, i så fall används den för att bestämma vad som skall utföras."
 
 # type: Plain text
-#: ../../man/dpkg.1:401
+#: ../../man/dpkg.1:402
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite>: Skriv över ett pakets filer med ett annats."
 
 # type: Plain text
-#: ../../man/dpkg.1:404
+#: ../../man/dpkg.1:405
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr "B<overwrite-dir> Skriv över ett pakets kataloger med ett annats filer."
 
 # type: Plain text
-#: ../../man/dpkg.1:407
+#: ../../man/dpkg.1:408
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2663,12 +2630,12 @@ msgstr ""
 "version."
 
 # type: Plain text
-#: ../../man/dpkg.1:410
+#: ../../man/dpkg.1:411
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Hantera även paket med fel maskinvaruarkitektur."
 
 # type: Plain text
-#: ../../man/dpkg.1:413
+#: ../../man/dpkg.1:414
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2676,25 +2643,25 @@ msgstr ""
 "troliga."
 
 # type: Plain text
-#: ../../man/dpkg.1:416
+#: ../../man/dpkg.1:417
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root>: Försök (av)installera saker även utan att vara root."
 
 # type: Plain text
-#: ../../man/dpkg.1:419
+#: ../../man/dpkg.1:420
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Installera ett paket även om det inte går att verifiera dess "
 "äkthet."
 
 # type: TP
-#: ../../man/dpkg.1:420
+#: ../../man/dpkg.1:421
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paket>,..."
 
 # type: Plain text
-#: ../../man/dpkg.1:424
+#: ../../man/dpkg.1:425
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2703,13 +2670,13 @@ msgstr ""
 "kontrollen, men det ges endast varningar, ingenting annat)."
 
 # type: TP
-#: ../../man/dpkg.1:424
-#, no-wrap
-msgid "B<--new> | B<--old>"
+#: ../../man/dpkg.1:425
+#, fuzzy, no-wrap
+msgid "B<--new>, B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: ../../man/dpkg.1:428
+#: ../../man/dpkg.1:429
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2717,13 +2684,13 @@ msgstr ""
 "deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:428 ../../man/dpkg-deb.1:211
+#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: ../../man/dpkg.1:432
+#: ../../man/dpkg.1:433
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2732,13 +2699,13 @@ msgstr ""
 "Detta är en flagga till B<dpkg-deb>(1)."
 
 # type: TP
-#: ../../man/dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+#: ../../man/dpkg.1:433
+#, fuzzy, no-wrap
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: ../../man/dpkg.1:437
+#: ../../man/dpkg.1:438
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2749,7 +2716,7 @@ msgstr ""
 "ändra något."
 
 # type: Plain text
-#: ../../man/dpkg.1:442
+#: ../../man/dpkg.1:443
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2762,13 +2729,13 @@ msgstr ""
 "att du troligen förväntade dig att ingenting skulle utföras)"
 
 # type: TP
-#: ../../man/dpkg.1:442
-#, no-wrap
-msgid "B<-R> | B<--recursive>"
+#: ../../man/dpkg.1:443
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2779,13 +2746,13 @@ msgstr ""
 "tillsammans med B<-i>, B<-A>, B<--install>, B<--unpack> och B<--avail>."
 
 # type: TP
-#: ../../man/dpkg.1:448
+#: ../../man/dpkg.1:449
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453
 #, fuzzy
 msgid ""
 "Don't install a package if a newer version of the same package is already "
@@ -2795,23 +2762,35 @@ msgstr ""
 "installerat. Detta är ett alias för B<--refuse-downgrade.>"
 
 # type: TP
-#: ../../man/dpkg.1:452
+#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168
+#: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70
+#: ../../man/dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<kat> | B<--admindir=>I<kat> | B<--instdir=>I<kat>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir=>I<kat>"
 
 # type: Plain text
-#: ../../man/dpkg.1:463
+#: ../../man/dpkg.1:458
+msgid ""
+"Change default administrative directory, which contains many files that give "
+"information about status of installed or uninstalled packages, etc.  "
+"(Defaults to I</var/lib/dpkg>)"
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:458
+#, fuzzy, no-wrap
+msgid "B<--instdir=>I<dir>"
+msgstr "B<--admindir=>I<kat>"
+
+# type: Plain text
+#: ../../man/dpkg.1:465
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Change default installation directory which refers to the directory where "
+"packages are to be installed. B<instdir> is also the directory passed to "
+"B<chroot>(2) before running package's installation scripts, which means that "
+"the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
 "Ändra standardkataloger. Förval för B<admindir> är I</var/lib/dpkg>, och "
 "innehåller filer som ger information om status för installerade och ej "
@@ -2822,14 +2801,27 @@ msgstr ""
 "B<admindir> till I<kat>B</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: ../../man/dpkg.1:465
+#, fuzzy, no-wrap
+msgid "B<--root=>I<dir>"
+msgstr "B<--admindir=>I<kat>"
 
 # type: Plain text
 #: ../../man/dpkg.1:469
 msgid ""
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg.1:469
+#, fuzzy, no-wrap
+msgid "B<-O>, B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
+
+# type: Plain text
+#: ../../man/dpkg.1:475
+msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
 "example, when a package is removed, it will be marked selected for "
@@ -2840,13 +2832,13 @@ msgstr ""
 "kommer paket som tas bort att markeras för installation."
 
 # type: TP
-#: ../../man/dpkg.1:469
-#, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+#: ../../man/dpkg.1:475
+#, fuzzy, no-wrap
+msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2854,13 +2846,13 @@ msgstr ""
 "Installera inte paketet om samma version av paketet redan är installerat."
 
 # type: TP
-#: ../../man/dpkg.1:473
+#: ../../man/dpkg.1:479
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, fuzzy
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
@@ -2878,13 +2870,13 @@ msgstr ""
 "prompt: conffile : \"nuvarande-fil\" \"ny-fil\" useredited distedited\""
 
 # type: TP
-#: ../../man/dpkg.1:480
+#: ../../man/dpkg.1:486
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, fuzzy
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
@@ -2908,40 +2900,40 @@ msgstr ""
 "konfigurationsfilsändringar där I<E<lt>val> antingen är install eller keep."
 
 # type: TP
-#: ../../man/dpkg.1:492
+#: ../../man/dpkg.1:498
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../../man/dpkg.1:495
+#: ../../man/dpkg.1:501
 msgid "Do not try to verify package signatures."
 msgstr "Försök inte verifiera paketsignaturer."
 
 # type: TP
-#: ../../man/dpkg.1:497 ../../man/dpkg.cfg.5:14
+#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 msgid "Configuration file with default options."
 msgstr "Konfigurationsfil med förvalda inställningar."
 
 # type: TP
-#: ../../man/dpkg.1:500
+#: ../../man/dpkg.1:506
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../../man/dpkg.1:504
+#: ../../man/dpkg.1:510
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr "Förvald loggfil (se I</etc/dpkg/dpkg.cfg>(5) och flaggan B<--log>)."
 
 # type: Plain text
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -2950,24 +2942,24 @@ msgstr ""
 "admindir> för information om hur du ändrar placeringen av dessa filer."
 
 # type: TP
-#: ../../man/dpkg.1:507
+#: ../../man/dpkg.1:513
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 msgid "List of available packages."
 msgstr "Lista över tillgängliga paket."
 
 # type: TP
-#: ../../man/dpkg.1:510
+#: ../../man/dpkg.1:516
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: ../../man/dpkg.1:516
+#: ../../man/dpkg.1:522
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2978,7 +2970,7 @@ msgstr ""
 "ej, osv. Se sektionen B<INFORMATION OM PAKET> för ytterligare information."
 
 # type: Plain text
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -2987,55 +2979,55 @@ msgstr ""
 "ytterligare information om dem:"
 
 # type: TP
-#: ../../man/dpkg.1:519
+#: ../../man/dpkg.1:525
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../../man/dpkg.1:521
+#: ../../man/dpkg.1:527
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../../man/dpkg.1:523
+#: ../../man/dpkg.1:529
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../../man/dpkg.1:525
+#: ../../man/dpkg.1:531
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../../man/dpkg.1:527
+#: ../../man/dpkg.1:533
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../../man/dpkg.1:529
+#: ../../man/dpkg.1:535
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../../man/dpkg.1:532
+#: ../../man/dpkg.1:538
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "MILJÖVARIABLER"
 
 # type: TP
-#: ../../man/dpkg.1:533
+#: ../../man/dpkg.1:539
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -3044,25 +3036,25 @@ msgstr ""
 "skal istället för att lägga sig i bakgrunden när ett skal startas."
 
 # type: TP
-#: ../../man/dpkg.1:537
+#: ../../man/dpkg.1:543
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
-#: ../../man/dpkg.1:540
+#: ../../man/dpkg.1:546
 #, fuzzy
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "Programmet B<dpkg> kommer att exekvera när ett nytt skal startas."
 
 # type: TP
-#: ../../man/dpkg.1:540 ../../man/dpkg-query.1:144
+#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: ../../man/dpkg.1:544
+#: ../../man/dpkg.1:550
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -3071,7 +3063,7 @@ msgstr ""
 "Används för närvarande enbart av -l."
 
 # type: SH
-#: ../../man/dpkg.1:545 ../../man/dpkg-architecture.1:246
+#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246
 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66
 #: ../../man/update-alternatives.8:356
 #, no-wrap
@@ -3079,53 +3071,53 @@ msgid "EXAMPLES"
 msgstr "EXEMPEL"
 
 # type: Plain text
-#: ../../man/dpkg.1:547
+#: ../../man/dpkg.1:553
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "För att lista paket relaterade till textredigeringsprogrammet vi:"
 
 # type: Plain text
-#: ../../man/dpkg.1:549
+#: ../../man/dpkg.1:555
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:552
+#: ../../man/dpkg.1:558
 #, fuzzy
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "För att se posterna i I</var/lib/dpkg/available> för två paket:"
 
 # type: Plain text
-#: ../../man/dpkg.1:554
+#: ../../man/dpkg.1:560
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:557
+#: ../../man/dpkg.1:563
 msgid "To search the listing of packages yourself:"
 msgstr "För att själv söka i paketlistan:"
 
 # type: Plain text
-#: ../../man/dpkg.1:559
+#: ../../man/dpkg.1:565
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:562
+#: ../../man/dpkg.1:568
 msgid "To remove an installed elvis package:"
 msgstr "För att ta bort det installerade paketet elvis:"
 
 # type: Plain text
-#: ../../man/dpkg.1:564
+#: ../../man/dpkg.1:570
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:569
+#: ../../man/dpkg.1:575
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3135,7 +3127,7 @@ msgstr ""
 "\"editors\":"
 
 # type: Plain text
-#: ../../man/dpkg.1:572
+#: ../../man/dpkg.1:578
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3145,18 +3137,18 @@ msgstr ""
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:575
+#: ../../man/dpkg.1:581
 msgid "To make a local copy of the package selection states:"
 msgstr "För att göra en lokal kopia av paketmarkeringarna:"
 
 # type: Plain text
-#: ../../man/dpkg.1:577
+#: ../../man/dpkg.1:583
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>mitturval>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:581
+#: ../../man/dpkg.1:587
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3164,7 +3156,7 @@ msgstr ""
 "att skriva:"
 
 # type: Plain text
-#: ../../man/dpkg.1:584
+#: ../../man/dpkg.1:590
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3174,12 +3166,13 @@ msgstr ""
 "     B<dpkg --set-selections E<lt>mitturval>\n"
 
 # type: Plain text
-#: ../../man/dpkg.1:590
+#: ../../man/dpkg.1:596
+#, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
 "application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"example, run B<dselect> and choose I<Install>."
 msgstr ""
 "Observera att detta faktiskt inte kommer installera eller ta bort något, "
 "utan bara sätta valstatus på de efterfrågade paketen. Du måste använda något "
@@ -3187,7 +3180,7 @@ msgstr ""
 "Till exempel kan du köra B<dselect> och välja \"Installera\"."
 
 # type: Plain text
-#: ../../man/dpkg.1:593
+#: ../../man/dpkg.1:599
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3196,22 +3189,23 @@ msgstr ""
 "ett bekvämare sätt att ändra paketmarkeringarna."
 
 # type: SH
-#: ../../man/dpkg.1:595
+#: ../../man/dpkg.1:601
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "YTTERLIGARE FUNKTIONER"
 
 # type: Plain text
-#: ../../man/dpkg.1:598
+#: ../../man/dpkg.1:604
+#, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 "Ytterligare funktioner kan erhållas genom att installera något av följande "
 "paket: I<apt>, I<aptitude> och I<debsums>."
 
 # type: Plain text
-#: ../../man/dpkg.1:608
+#: ../../man/dpkg.1:614
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3220,22 +3214,22 @@ msgstr ""
 "(5), B<dpkg.cfg>(5) och B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: ../../man/dpkg.1:611
+#: ../../man/dpkg.1:617
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> ger oftast mindre information än vad som vore hjälpsamt."
 
 # type: SH
-#: ../../man/dpkg.1:612 ../../man/dpkg-buildpackage.1:193
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:156
+#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191
+#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:257
+#: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247
 #: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "FÖRFATTARE"
 
 # type: Plain text
-#: ../../man/dpkg.1:616
+#: ../../man/dpkg.1:622
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3250,6 +3244,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
+# type: TH
+#: ../../man/dpkg-architecture.1:1 ../../man/start-stop-daemon.8:1
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: ../../man/dpkg-architecture.1:4
 msgid ""
@@ -4000,10 +4000,11 @@ msgstr "B<-G>"
 
 # type: Plain text
 #: ../../man/dpkg-buildpackage.1:19
+#, fuzzy
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
-"distributed, and"
-msgstr ""
+"distributed."
+msgstr "Delar ett ensamt binärt Debianpaket i flera delar."
 
 # type: TP
 #: ../../man/dpkg-buildpackage.1:19 ../../man/dpkg-checkbuilddeps.1:23
@@ -4019,7 +4020,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:23
+#: ../../man/dpkg-buildpackage.1:23 ../../man/dpkg-genchanges.1:27
 #, fuzzy, no-wrap
 msgid "B<-S>"
 msgstr "B<-G>"
@@ -4031,57 +4032,57 @@ msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr "Delar ett ensamt binärt Debianpaket i flera delar."
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"The B<-s>I<x> options control whether the original source archive is "
+"included in the upload if any source is being generated (i.e.  B<-b> or B<-"
+"B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:33
+#: ../../man/dpkg-buildpackage.1:31 ../../man/dpkg-genchanges.1:36
 #, fuzzy, no-wrap
 msgid "B<-si>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 msgid ""
-"Include the original source if the version number ends in B<-0> or B<-1>, i."
-"e. if the Debian revision part of the version number is B<0> or B<1>.  "
-"B<This is the default.>"
+"By default, or if specified, the original source will be included if the "
+"version number ends in B<-0> or B<-1>, i.e. if the Debian revision part of "
+"the version number is B<0> or B<1>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:40
+#: ../../man/dpkg-buildpackage.1:38 ../../man/dpkg-genchanges.1:43
 #, fuzzy, no-wrap
 msgid "B<-sa>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:43
+#: ../../man/dpkg-buildpackage.1:41 ../../man/dpkg-genchanges.1:46
 #, fuzzy, no-wrap
 msgid "B<-sd>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44 ../../man/dpkg-genchanges.1:49
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:46
+#: ../../man/dpkg-buildpackage.1:44
 #, fuzzy, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:51
+#: ../../man/dpkg-buildpackage.1:49
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4089,39 +4090,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:51 ../../man/dpkg-genchanges.1:18
+#: ../../man/dpkg-buildpackage.1:49 ../../man/dpkg-genchanges.1:50
 #: ../../man/dpkg-gencontrol.1:17 ../../man/dpkg-parsechangelog.1:29
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-parsechangelog.1:33
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:55 ../../man/dpkg-genchanges.1:23
+#: ../../man/dpkg-buildpackage.1:53 ../../man/dpkg-genchanges.1:55
 #, fuzzy, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr "B< >E<lt>lång beskrivningE<gt>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:60 ../../man/dpkg-genchanges.1:29
+#: ../../man/dpkg-buildpackage.1:58 ../../man/dpkg-genchanges.1:61
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4129,13 +4130,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:66 ../../man/dpkg-genchanges.1:35
+#: ../../man/dpkg-buildpackage.1:64 ../../man/dpkg-genchanges.1:67
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:72 ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-buildpackage.1:70 ../../man/dpkg-genchanges.1:73
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4143,87 +4144,87 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:72
+#: ../../man/dpkg-buildpackage.1:70
 #, fuzzy, no-wrap
 msgid "B<-D>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:75
+#: ../../man/dpkg-buildpackage.1:73
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-G>"
 
 # type: SS
-#: ../../man/dpkg-buildpackage.1:78
+#: ../../man/dpkg-buildpackage.1:76
 #, fuzzy
 msgid "Do not check build dependencies and conflicts."
 msgstr "Lösa beroenden och konflikter"
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:78 ../../man/dpkg-source.1:101
+#: ../../man/dpkg-buildpackage.1:76 ../../man/dpkg-source.1:101
 #, fuzzy, no-wrap
 msgid "B<-W>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:84
+#: ../../man/dpkg-buildpackage.1:82
 msgid ""
 "Turn certain errors into warnings. Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:84 ../../man/dpkg-source.1:104
+#: ../../man/dpkg-buildpackage.1:82 ../../man/dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-E>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 msgid ""
 "Negates a previously set B<-W>.  Only B<dpkg-source> uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:92
+#: ../../man/dpkg-buildpackage.1:90
 #, fuzzy, no-wrap
 msgid "B<-nc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:95
+#: ../../man/dpkg-buildpackage.1:93
 #, fuzzy, no-wrap
 msgid "B<-tc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:101
+#: ../../man/dpkg-buildpackage.1:99
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4238,13 +4239,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:127
+#: ../../man/dpkg-buildpackage.1:125
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4256,71 +4257,64 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:152
+#: ../../man/dpkg-buildpackage.1:150
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy
 msgid "Specify a key-ID to use when signing packages."
 msgstr "Den sista raden på skärmen när paket väljs."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:155
+#: ../../man/dpkg-buildpackage.1:153
 #, fuzzy, no-wrap
 msgid "B<-us>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy
 msgid "Do not sign the source package."
 msgstr "Paketets korta beskrivning."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:158
+#: ../../man/dpkg-buildpackage.1:156
 #, fuzzy, no-wrap
 msgid "B<-uc>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:161
+#: ../../man/dpkg-buildpackage.1:159
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:161 ../../man/dpkg-source.1:108
+#: ../../man/dpkg-buildpackage.1:159 ../../man/dpkg-source.1:108
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:165
+#: ../../man/dpkg-buildpackage.1:163
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:165 ../../man/dpkg-source.1:128
+#: ../../man/dpkg-buildpackage.1:163 ../../man/dpkg-source.1:128
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:170
+#: ../../man/dpkg-buildpackage.1:168
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: TP
-#: ../../man/dpkg-buildpackage.1:170 ../../man/dpkg-checkbuilddeps.1:19
-#: ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir=>I<kat>"
-
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-checkbuilddeps.1:23
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-checkbuilddeps.1:23
 #: ../../man/dpkg-query.1:74 ../../man/dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
@@ -4328,8 +4322,8 @@ msgid ""
 msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
 
 # type: TP
-#: ../../man/dpkg-buildpackage.1:174 ../../man/dpkg-distaddfile.1:32
-#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-buildpackage.1:172 ../../man/dpkg-distaddfile.1:32
+#: ../../man/dpkg-deb.1:162 ../../man/dpkg-genchanges.1:127
 #: ../../man/dpkg-gencontrol.1:98 ../../man/dpkg-name.1:56
 #: ../../man/dpkg-parsechangelog.1:33 ../../man/dpkg-query.1:59
 #: ../../man/dpkg-scanpackages.1:81 ../../man/dpkg-shlibdeps.1:109
@@ -4339,14 +4333,14 @@ msgid "B<-h>, B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:185
+#: ../../man/dpkg-buildpackage.1:183
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-buildpackage.1:192
+#: ../../man/dpkg-buildpackage.1:190
 #, fuzzy
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
@@ -4401,7 +4395,7 @@ msgstr "B<-G>"
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:33
 #, fuzzy
-msgid "Copyright 2001 Joey Hess"
+msgid "Copyright (C) 2001 Joey Hess"
 msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
 
 # type: UR
@@ -4413,7 +4407,7 @@ msgstr "mailto:wakkerma@debian.org"
 # type: Plain text
 #: ../../man/dpkg-checkbuilddeps.1:35
 #, fuzzy
-msgid "E<lt>joeyh@debian.orgE<gt>."
+msgid "E<lt>joeyh@debian.orgE<gt>"
 msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
 # type: TH
@@ -4454,7 +4448,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:111
+#: ../../man/dpkg-distaddfile.1:28 ../../man/dpkg-genchanges.1:99
 #: ../../man/dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
 msgid "B<-f>I<fileslistfile>"
@@ -4468,7 +4462,7 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:147
+#: ../../man/dpkg-distaddfile.1:40 ../../man/dpkg-genchanges.1:135
 #: ../../man/dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
 msgid "B<debian/files>"
@@ -4593,7 +4587,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<arkiv> [I<control-filnamn> ..]"
 
 # type: Plain text
@@ -4643,7 +4637,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:101
 #, fuzzy, no-wrap
-msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<arkiv> [I<control-fältnamn> ...]"
 
 # type: Plain text
@@ -4757,7 +4751,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-e>, B<--control> I<archive directory>"
+msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb> B<-e>|B<--control> I<arkivkatalog>"
 
 # type: Plain text
@@ -4951,20 +4945,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-deb.1:252
-#, fuzzy
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-deb> och denna manualsida skrevs av Ian Jackson. De är "
-"upphovsrättsskyddade 1995-1996 av honom och släppta under GNU General Public "
-"Licence; det finns INGEN garanti. Se B</usr/share/doc/dpkg/copyright> och B</"
-"usr/share/common-licenses/GPL> för detaljer."
-
 # type: TH
 #: ../../man/dpkg-divert.8:1
 #, fuzzy, no-wrap
@@ -4993,8 +4973,8 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg-divert.8:23
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
+"File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a I<diverted> location. Diversions can be used "
 "through the Debian package scripts to move a file away when it causes a "
 "conflict. System administrators can also use it to override some package's "
 "configuration file, or whenever some files (which aren't marked as "
@@ -5219,19 +5199,19 @@ msgstr "B</var/lib/dpkg/parts>"
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"important to dpkg, such as I<status> or I<available>."
 msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-divert.8:117
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension I<-"
+"old>, before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-divert.8:123
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ../../man/dpkg-divert.8:123 ../../man/update-alternatives.8:394
+msgid "Copyright (C) 1995 Ian Jackson"
 msgstr ""
 
 # type: TH
@@ -5259,65 +5239,59 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:23
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"I<version> to be used."
-msgstr ""
-
 # type: TP
-#: ../../man/dpkg-genchanges.1:41
+#: ../../man/dpkg-genchanges.1:18
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<--discard>, B<-d>"
+msgid "B<-b>, B<-B>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:49
+#: ../../man/dpkg-genchanges.1:27
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-genchanges> if any source is being generated (i."
-"e., B<-b> or B<-B> haven't been used)."
+"Specifies that a binary-only build is taking place (no source files are to "
+"be included). There's no distinction between B<-b> and B<-B>, the produced "
+"B<.changes> file will include whatever files were created by the B<binary-*> "
+"target(s) of the package being built."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:57
+#: ../../man/dpkg-genchanges.1:31
+#, fuzzy
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
-msgstr ""
+"Specifies that only the source should be uploaded (no binary packages will "
+"be included)."
+msgstr "Delar ett ensamt binärt Debianpaket i flera delar."
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:62
+#: ../../man/dpkg-genchanges.1:55
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:62 ../../man/dpkg-gencontrol.1:20
+#: ../../man/dpkg-genchanges.1:73 ../../man/dpkg-gencontrol.1:20
 #: ../../man/dpkg-source.1:85
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-source.1:89
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-source.1:89
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:66 ../../man/dpkg-gencontrol.1:24
+#: ../../man/dpkg-genchanges.1:77 ../../man/dpkg-gencontrol.1:24
 #: ../../man/dpkg-shlibdeps.1:99 ../../man/dpkg-source.1:89
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
@@ -5325,74 +5299,54 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:72 ../../man/dpkg-gencontrol.1:30
+#: ../../man/dpkg-genchanges.1:83 ../../man/dpkg-gencontrol.1:30
 #: ../../man/dpkg-source.1:95
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<oktalvärde>B< | --debug=>I<oktalvärde>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:75 ../../man/dpkg-gencontrol.1:33
+#: ../../man/dpkg-genchanges.1:86 ../../man/dpkg-gencontrol.1:33
 #: ../../man/dpkg-source.1:98
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:78 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:101
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:78
-#, fuzzy, no-wrap
-msgid "B<-b>, B<-B>, B<-S>"
-msgstr "B<-t>|B<--test>"
-
-# type: Plain text
-#: ../../man/dpkg-genchanges.1:101
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-
-# type: TP
-#: ../../man/dpkg-genchanges.1:101 ../../man/dpkg-gencontrol.1:36
+#: ../../man/dpkg-genchanges.1:89 ../../man/dpkg-gencontrol.1:36
 #: ../../man/dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:106 ../../man/dpkg-gencontrol.1:41
+#: ../../man/dpkg-genchanges.1:94 ../../man/dpkg-gencontrol.1:41
 #: ../../man/dpkg-parsechangelog.1:16 ../../man/dpkg-source.1:73
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:111 ../../man/dpkg-gencontrol.1:46
+#: ../../man/dpkg-genchanges.1:99 ../../man/dpkg-gencontrol.1:46
 #: ../../man/dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
@@ -5400,21 +5354,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:115
+#: ../../man/dpkg-genchanges.1:103
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:115 ../../man/dpkg-gencontrol.1:50
+#: ../../man/dpkg-genchanges.1:103 ../../man/dpkg-gencontrol.1:50
 #: ../../man/dpkg-parsechangelog.1:21 ../../man/dpkg-source.1:80
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:120 ../../man/dpkg-gencontrol.1:55
+#: ../../man/dpkg-genchanges.1:108 ../../man/dpkg-gencontrol.1:55
 #: ../../man/dpkg-parsechangelog.1:26 ../../man/dpkg-source.1:85
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
@@ -5423,13 +5377,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:120
+#: ../../man/dpkg-genchanges.1:108
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5437,13 +5391,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-genchanges.1:131
+#: ../../man/dpkg-genchanges.1:119
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:139
+#: ../../man/dpkg-genchanges.1:127
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5451,7 +5405,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-genchanges.1:155
+#: ../../man/dpkg-genchanges.1:143
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
@@ -5463,6 +5417,13 @@ msgstr ""
 msgid "dpkg-gencontrol"
 msgstr "deb-control"
 
+# type: TH
+#: ../../man/dpkg-gencontrol.1:1 ../../man/dpkg-scanpackages.1:16
+#: ../../man/dpkg-scansources.1:1 ../../man/dpkg-shlibdeps.1:1
+#, fuzzy, no-wrap
+msgid "2007-06-12"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: ../../man/dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
@@ -5769,15 +5730,9 @@ msgid ""
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
-#: ../../man/dpkg-name.1:111
-#, fuzzy
-msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+#: ../../man/dpkg-name.1:107
+msgid "Copyright 1995,1996 Erick Branderhorst"
 msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
 
 # type: Plain text
 #: ../../man/dpkg-parsechangelog.1:1
@@ -5859,7 +5814,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgid "B<-l>, B<--list> I<package-name-pattern>..."
 msgstr "B<-l> | B<--list> I<paketnamnsmönster> ..."
 
 # type: Plain text
@@ -5901,7 +5856,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgid "B<-W>, B<--show> I<package-name-pattern>..."
 msgstr "B<-W> | B<--show> I<paketnamnsmönster> ..."
 
 # type: Plain text
@@ -5922,7 +5877,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name> ..."
+msgid "B<-s>, B<--status> I<package-name>..."
 msgstr "B<-s> | B<--status> I<paketnamn> ..."
 
 # type: Plain text
@@ -5937,13 +5892,14 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L> | B<--listfiles> I<paketnamn> ..."
 
 # type: Plain text
 #: ../../man/dpkg-query.1:49
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
+"List files installed to your system from I<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
 msgstr ""
 "Listar filer som installerats på ditt system från B<paketnamn>. Observera "
@@ -5952,7 +5908,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S> | B<--search> I<filnamnssökmönster> ..."
 
 # type: Plain text
@@ -5970,7 +5926,7 @@ msgstr ""
 # type: TP
 #: ../../man/dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>"
+msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p> |B<--print-avail> I<paketnamn>"
 
 # type: Plain text
@@ -6125,7 +6081,8 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:151
-msgid "Copyright 2001 Wichert Akkerman"
+#, fuzzy
+msgid "Copyright (C) 2001 Wichert Akkerman"
 msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
 
 # type: UR
@@ -6712,117 +6669,165 @@ msgid ""
 "filenames to exclude."
 msgstr ""
 
+# type: Plain text
+#: ../../man/dpkg-source.1:140
+msgid ""
+"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
+"one only the last one will be used."
+msgstr ""
+
 # type: TP
-#: ../../man/dpkg-source.1:135
+#: ../../man/dpkg-source.1:140
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<Build options (with -b):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:150
+#: ../../man/dpkg-source.1:148
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:148
+#, fuzzy, no-wrap
+msgid "B<-sk>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:162
+#: ../../man/dpkg-source.1:154
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Specifies to expect the original source as a tarfile, by default "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  It will leave this "
+"original source in place as a tarfile, or copy it to the current directory "
+"if it isn't already there."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:154 ../../man/dpkg-source.1:216
+#, fuzzy, no-wrap
+msgid "B<-sp>"
+msgstr "B<-G>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:159
+msgid "Like B<-sk> but will remove that tarball again afterwards."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:159 ../../man/dpkg-source.1:222
+#, fuzzy, no-wrap
+msgid "B<-su>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:173
+#: ../../man/dpkg-source.1:167
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"Specifies that the original source is expected as a directory, by default "
+"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
+"new original source archive from it."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:167
+#, fuzzy, no-wrap
+msgid "B<-sr>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:182
+#: ../../man/dpkg-source.1:172
+msgid "Like B<-su> but will remove that directory after it has been used."
+msgstr ""
+
+# type: TP
+#: ../../man/dpkg-source.1:172
+#, fuzzy, no-wrap
+msgid "B<-ss>"
+msgstr "B<-G>"
+
+# type: Plain text
+#: ../../man/dpkg-source.1:180
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Specifies that the original source is available both as a directory and as a "
+"tarfile. If will use the directory to create the diff, but the tarfile to "
+"create the B<.dsc>.  This option must be used with care - if the directory "
+"and tarfile do not match a bad source archive will be generated."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:180 ../../man/dpkg-source.1:225
+#, fuzzy, no-wrap
+msgid "B<-sn>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:211
+#: ../../man/dpkg-source.1:186
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-"the directory, overwriting it, if B<-sA> was specified (this is equivalent "
-"to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the "
-"default."
+"Specifies to not look for any original source, and to not generate a diff.  "
+"The second argument, if supplied, must be the empty string. This is used for "
+"Debian-specific packages which do not have a separate upstream source and "
+"therefore have no debianisation diffs."
 msgstr ""
 
+# type: TP
+#: ../../man/dpkg-source.1:186
+#, fuzzy, no-wrap
+msgid "B<-sa> or B<-sA>"
+msgstr "B<--split>, B<-s>"
+
 # type: Plain text
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Specifies to look for the original source archive as a tarfile or as a "
+"directory - the second argument, if any, may be either, or the empty string "
+"(this is equivalent to using B<-sn>).  If a tarfile is found it will unpack "
+"it to create the diff and remove it afterwards (this is equivalent to B<-"
+"sp>); if a directory is found it will pack it to create the original source "
+"and remove it afterwards (this is equivalent to B<-sr>); if neither is found "
+"it will assume that the package has no debianisation diffs, only a "
+"straightforward source archive (this is equivalent to B<-sn>).  If both are "
+"found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
+"sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
+"sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: TP
-#: ../../man/dpkg-source.1:217
+#: ../../man/dpkg-source.1:212
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<Extract options (with -x):>"
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:220
+#: ../../man/dpkg-source.1:216
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:227
+#: ../../man/dpkg-source.1:222
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Used when extracting then the original source (if any) will be left as a "
+"tarfile. If it is not already located in the current directory or if an "
+"existing but different file is there it will be copied there.  (B<This is "
+"the default>)."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:230
-msgid "B<-su> unpacks the original source tree."
-msgstr ""
-
-# type: Plain text
-#: ../../man/dpkg-source.1:235
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+#: ../../man/dpkg-source.1:225
+msgid "Unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:240
+#: ../../man/dpkg-source.1:230
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Ensures that the original source is neither copied to the current directory "
+"nor unpacked. Any original source tree that was in the current directory is "
+"still removed."
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:251
+#: ../../man/dpkg-source.1:241
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6830,7 +6835,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/dpkg-source.1:256
+#: ../../man/dpkg-source.1:246
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
@@ -7303,20 +7308,6 @@ msgstr ""
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#: ../../man/dpkg-split.1:241
-#, fuzzy
-msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"B<dpkg-split> och denna manualsida skrevs av Ian Jackson.  Upphovsrätten © "
-"1995-1996 ligger hos honom och de är släppta under GNU General Public "
-"Licence; det finns INGEN GARANTI. Se B</usr/share/dpkg/copyright> och B</usr/"
-"share/common-licenses/GPL> för ytterligare detaljer."
-
 # type: TH
 #: ../../man/dpkg-statoverride.8:1
 #, no-wrap
@@ -7461,12 +7452,6 @@ msgid ""
 "extension \"-old\", before replacing it with the new one."
 msgstr ""
 
-# type: Plain text
-#: ../../man/dpkg-statoverride.8:83
-#, fuzzy
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
-
 # type: SS
 #: ../../man/dselect.1:1
 #, no-wrap
@@ -9063,15 +9048,9 @@ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: ../../man/install-info.8:297
-#, fuzzy
-msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+#: ../../man/install-info.8:293
+msgid "Copyright 1994 Ian Jackson"
 msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
 
 # type: Plain text
 #: ../../man/start-stop-daemon.8:1
@@ -9837,7 +9816,7 @@ msgstr ""
 # type: TP
 #: ../../man/update-alternatives.8:204
 #, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>]..."
 msgstr ""
 
 # type: Plain text
@@ -10141,39 +10120,137 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/update-alternatives.8:396
-#, fuzzy
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
+#: ../../man/update-alternatives.8:399
+msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith."
 msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
 
 # type: Plain text
-#: ../../man/update-alternatives.8:400
+#: ../../man/update-alternatives.8:402
 #, fuzzy
 msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
+"This is free documentation; see the GNU General Public Licence version 2 or "
+"later for copying conditions. There is NO WARRANTY."
 msgstr ""
 "Detta är fri programvara; se GNU General Public License version 2 eller "
 "senare för kopieringsvillkor. Det finns INGEN garanti."
 
-# type: Plain text
-#: ../../man/update-alternatives.8:402
-msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
-msgstr ""
-
 # type: Plain text
 #: ../../man/update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: TP
+#~ msgid "B<dpkg -C> | B<--audit>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#~ msgid "B<dpkg --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#~ msgid "B<dpkg -Dh >|B< --debug=help>"
+#~ msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: TP
+#~ msgid "B<dpkg --licence> | B<dpkg --license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#~ msgid "B<dpkg --version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: TP
+#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+#~ msgstr "B<--root=>I<kat> | B<--admindir=>I<kat> | B<--instdir=>I<kat>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-deb> och denna manualsida skrevs av Ian Jackson. De är "
+#~ "upphovsrättsskyddade 1995-1996 av honom och släppta under GNU General "
+#~ "Public Licence; det finns INGEN garanti. Se B</usr/share/doc/dpkg/"
+#~ "copyright> och B</usr/share/common-licenses/GPL> för detaljer."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-si>, B<-sa>, B<-sd>"
+#~ msgstr "B<--discard>, B<-d>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; "
+#~ "see the GNU General Public Licence version 2 or later for copying "
+#~ "conditions. There is B<no> warranty."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: Plain text
+#~ msgid "Copyright 2001 Wichert Akkerman"
+#~ msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+#~ "Copyright (C) 1995-1996 by him and released under the GNU General Public "
+#~ "Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/"
+#~ "dpkg/copyright> and I</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "B<dpkg-split> och denna manualsida skrevs av Ian Jackson.  Upphovsrätten "
+#~ "© 1995-1996 ligger hos honom och de är släppta under GNU General Public "
+#~ "Licence; det finns INGEN GARANTI. Se B</usr/share/dpkg/copyright> och B</"
+#~ "usr/share/common-licenses/GPL> för ytterligare detaljer."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Copyright 2000 Wichert Akkerman"
+#~ msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the "
+#~ "GNU General Public Licence version 2 or later for copying conditions. "
+#~ "There is I<no> warranty."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+#~ "software; see the GNU General Public Licence version 2 or later for "
+#~ "copying conditions. There is NO warranty."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is "
+#~ "free documentation; see the GNU General Public Licence version 2 or later "
+#~ "for copying conditions. There is NO WARRANTY."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
 # type: TH
 #~ msgid "2006-04-09"
 #~ msgstr "2006-04-09"
@@ -10451,10 +10528,6 @@ msgstr ""
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
 #~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
 
-# type: TP
-#~ msgid "B<--split>, B<-s>"
-#~ msgstr "B<--split>, B<-s>"
-
 # type: TP
 #~ msgid "B<--join>, B<-j>"
 #~ msgstr "B<--join>, B<-j>"
-- 
2.39.5