[SCM] Git repository for devscripts branch, master, updated. v2.12.4-116-g24c5a02
James McCoy
jamessan at debian.org
Thu Dec 20 03:49:52 UTC 2012
The following commit has been merged in the master branch:
commit 24c5a024c1dde586c81aa922851944de7124e473
Author: James McCoy <jamessan at debian.org>
Date: Wed Dec 19 22:49:35 2012 -0500
po4a update
Signed-off-by: James McCoy <jamessan at debian.org>
diff --git a/po4a/po/de.po b/po4a/po/de.po
index 6d7cb17..577c5f1 100644
--- a/po4a/po/de.po
+++ b/po4a/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: devscripts 2.12.4\n"
"Report-Msgid-Bugs-To: devscripts at packages.debian.org\n"
-"POT-Creation-Date: 2012-10-13 19:46-0300\n"
+"POT-Creation-Date: 2012-12-19 22:36-0500\n"
"PO-Revision-Date: 2012-10-15 20:14+0100\n"
"Last-Translator: Chris Leick <c.leick at vollbio.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -211,7 +211,7 @@ msgstr ""
#: ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18
#: ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225
#: ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93
-#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:336
+#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:342
#: ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10
#: ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17
#: ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33
@@ -256,7 +256,7 @@ msgstr "zeigt eine Hilfenachricht an und endet erfolgreich"
#. type: SH
#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30
-#: ../scripts/uscan.1:321
+#: ../scripts/uscan.1:327
#, no-wrap
msgid "EXAMPLE"
msgstr "BEISPIEL"
@@ -329,12 +329,12 @@ msgstr ""
#. type: SH
#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105
-#: ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263
+#: ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:263
#: ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62
#: ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53
#: ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115
#: ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222
-#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:858
+#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:863
#: ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132
#: ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66
#: ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410
@@ -342,10 +342,10 @@ msgstr ""
#: ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118
#: ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73
#: ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19
-#: ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:139
+#: ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:144
#: ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51
#: ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332
-#: ../scripts/tagpending.pl:148 ../scripts/uscan.1:541
+#: ../scripts/tagpending.pl:148 ../scripts/uscan.1:547
#: ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29
#: ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54
#, no-wrap
@@ -376,13 +376,13 @@ msgstr ""
#. type: SH
#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54
-#: ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62
+#: ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:65
#: ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68
#: ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59
#: ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100
#: ../scripts/debc.1:120 ../scripts/debchange.1:476
#: ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111
-#: ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136
+#: ../scripts/debcommit.pl:859 ../scripts/debdiff.1:222 ../scripts/debi.1:136
#: ../scripts/debpkg.1:23 ../scripts/debrelease.1:137
#: ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71
#: ../scripts/debsign.1:146 ../scripts/debuild.1:423
@@ -394,11 +394,11 @@ msgstr ""
#: ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20
#: ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18
#: ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30
-#: ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:143
+#: ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:148
#: ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56
#: ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336
#: ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81
-#: ../scripts/uscan.1:547 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19
+#: ../scripts/uscan.1:553 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19
#: ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31
#: ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58
#, no-wrap
@@ -1225,7 +1225,7 @@ msgstr ""
#: ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24
#: ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89
#: ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69
-#: ../scripts/rmadison.pl:281 ../scripts/uscan.1:444 ../scripts/uupdate.1:78
+#: ../scripts/rmadison.pl:281 ../scripts/uscan.1:450 ../scripts/uupdate.1:78
#: ../scripts/who-uploads.1:40
#, no-wrap
msgid "B<--no-conf>, B<--noconf>"
@@ -1238,7 +1238,7 @@ msgstr "B<--no-conf>, B<--noconf>"
#: ../scripts/debsign.1:100 ../scripts/debuild.1:225
#: ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28
#: ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114
-#: ../scripts/nmudiff.1:73 ../scripts/uscan.1:448 ../scripts/uupdate.1:82
+#: ../scripts/nmudiff.1:73 ../scripts/uscan.1:454 ../scripts/uupdate.1:82
#: ../scripts/who-uploads.1:44
msgid ""
"Do not read any configuration files. This can only be used as the first "
@@ -1351,8 +1351,8 @@ msgid ""
msgstr ""
"Optionen könnten nach dem Befehl B<bugs> zusätzlich oder anstelle von "
"Optionen am Anfang der Befehlszeile angegeben werden: An diesem Punkt "
-"erkannte Optionen sind: B<-o>/B<--offline>/B<--online>, B<-m>/B<--mbox>, "
-"B<--mailreader> und B<-->[B<no->]B<cache>. Diese wurden an früherer Stelle in "
+"erkannte Optionen sind: B<-o>/B<--offline>/B<--online>, B<-m>/B<--mbox>, B<--"
+"mailreader> und B<-->[B<no->]B<cache>. Diese wurden an früherer Stelle in "
"dieser Handbuchseite beschrieben. Falls Sie entweder die Option B<-o> oder "
"B<--offline> benutzt haben oder es bereits eine aktuelle Kopie des lokalen "
"Zwischenspeichers gibt, wird die zwischengespeicherte Version benutzt."
@@ -2184,8 +2184,8 @@ msgid ""
"B<=> flag is used, where the command"
msgstr ""
"zeigt an, dass ein I<Fehler> ein anderes I<Paket> betrifft, als das, gegen "
-"das er eingereicht wurde, was dazu führt, dass der I<Fehler> standardmäßig in "
-"der I<Paket>liste des anderen Pakets aufgeführt wird. Dies sollte "
+"das er eingereicht wurde, was dazu führt, dass der I<Fehler> standardmäßig "
+"in der I<Paket>liste des anderen Pakets aufgeführt wird. Dies sollte "
"üblicherweise benutzt werden, wo der I<Fehler> ernst genug ist, um mehrere "
"Berichte von Benutzern dem falschen Paket zuzuweisen. Es muss mindestens ein "
"I<Paket> angegeben werden, sogar, wenn der Schalter B<=> benutzt wird, wobei "
@@ -2815,7 +2815,7 @@ msgstr ""
#. type: SH
#: ../scripts/bts.pl:4002 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92
#: ../scripts/debchange.1:392 ../scripts/debcheckout.pl:177
-#: ../scripts/debclean.1:90 ../scripts/debcommit.pl:97
+#: ../scripts/debclean.1:90 ../scripts/debcommit.pl:99
#: ../scripts/debdiff.1:167 ../scripts/debi.1:109 ../scripts/debrelease.1:105
#: ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290
#: ../scripts/dget.pl:609 ../scripts/dpkg-depcheck.1:102
@@ -2823,13 +2823,13 @@ msgstr ""
#: ../scripts/licensecheck.pl:96 ../scripts/mass-bug.pl:132
#: ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106
#: ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:290
-#: ../scripts/uscan.1:454 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
+#: ../scripts/uscan.1:460 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
#, no-wrap
msgid "CONFIGURATION VARIABLES"
msgstr "KONFIGURATIONSVARIABLEN"
#. type: textblock
-#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:99
+#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:101
#: ../scripts/licensecheck.pl:98 ../scripts/mass-bug.pl:134
msgid ""
"The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are "
@@ -3250,7 +3250,7 @@ msgstr "führt den Fehlersuchmodus aus."
#: ../scripts/debclean.1:84 ../scripts/diff2patches.1:22
#: ../scripts/grep-excuses.1:22 ../scripts/mass-bug.pl:117
#: ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92
-#: ../scripts/uscan.1:448
+#: ../scripts/uscan.1:454
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3269,7 +3269,7 @@ msgstr "zeigt die Aufrufinformationen."
#: ../scripts/grep-excuses.1:25 ../scripts/mass-bug.pl:121
#: ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95
#: ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:277
-#: ../scripts/uscan.1:451 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
+#: ../scripts/uscan.1:457 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3319,7 +3319,7 @@ msgstr ""
"Option »update« für dieses Werkzeug nötig ist."
#. type: =head1
-#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:847
+#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:852
#: ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:120
#: ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89
#: ../scripts/transition-check.pl:72
@@ -3396,7 +3396,7 @@ msgstr "wählt die Architektur aus (Vorgabe: »B<dpkg --print-architecture>«)."
#. type: Plain text
#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239
-#: ../scripts/mass-bug.pl:123 ../scripts/uscan.1:454
+#: ../scripts/mass-bug.pl:123 ../scripts/uscan.1:460
msgid "Display version information."
msgstr "zeigt Versionsinformationen."
@@ -3745,7 +3745,7 @@ msgstr ""
#. type: TP
#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24
-#: ../scripts/transition-check.pl:66 ../scripts/uscan.1:512
+#: ../scripts/transition-check.pl:66 ../scripts/uscan.1:518
#: ../scripts/wnpp-check.1:29
#, no-wrap
msgid "1"
@@ -3772,13 +3772,24 @@ msgstr ""
"nicht lesbar oder wurde nicht gefunden. Die Warnmeldung wird Einzelheiten "
"preisgeben."
+#. type: TP
+#: ../scripts/checkbashisms.1:60
+#, no-wrap
+msgid "4"
+msgstr ""
+
#. type: Plain text
-#: ../scripts/checkbashisms.1:62
+#: ../scripts/checkbashisms.1:63
+msgid "No bashisms were detected in a bash script."
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/checkbashisms.1:65
msgid "B<lintian>(1)."
msgstr "B<lintian>(1)"
#. type: Plain text
-#: ../scripts/checkbashisms.1:65
+#: ../scripts/checkbashisms.1:68
msgid ""
"B<checkbashisms> was originally written as a shell script by Yann Dirson "
"E<lt>I<dirson at debian.org>E<gt> and rewritten in Perl with many more features "
@@ -5814,7 +5825,7 @@ msgstr ""
#. type: SH
#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24
#: ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49
-#: ../scripts/uscan.1:279
+#: ../scripts/uscan.1:285
#, no-wrap
msgid "Directory name checking"
msgstr "Prüfung von Verzeichnisnamen"
@@ -5846,14 +5857,14 @@ msgstr ""
#. type: Plain text
#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37
#: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63
-#: ../scripts/uscan.1:296
+#: ../scripts/uscan.1:302
msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:"
msgstr "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> kann die folgenden Werte annehmen:"
#. type: TP
#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37
#: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63
-#: ../scripts/uscan.1:296
+#: ../scripts/uscan.1:302
#, no-wrap
msgid "B<0>"
msgstr "B<0>"
@@ -5861,14 +5872,14 @@ msgstr "B<0>"
#. type: Plain text
#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40
#: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66
-#: ../scripts/uscan.1:299
+#: ../scripts/uscan.1:305
msgid "Never check the directory name."
msgstr "prüft den Verzeichnisnamen nie."
#. type: TP
#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40
#: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66
-#: ../scripts/uscan.1:299
+#: ../scripts/uscan.1:305
#, no-wrap
msgid "B<1>"
msgstr "B<1>"
@@ -5886,7 +5897,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44
#: ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70
-#: ../scripts/uscan.1:305
+#: ../scripts/uscan.1:311
#, no-wrap
msgid "B<2>"
msgstr "B<2>"
@@ -5894,7 +5905,7 @@ msgstr "B<2>"
#. type: Plain text
#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47
#: ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73
-#: ../scripts/uscan.1:308
+#: ../scripts/uscan.1:314
msgid "Always check the directory name."
msgstr "prüft den Verzeichnisnamen immer."
@@ -5949,7 +5960,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69
#: ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276
-#: ../scripts/uscan.1:433
+#: ../scripts/uscan.1:439
#, no-wrap
msgid "B<--check-dirname-level> I<N>"
msgstr "B<--check-dirname-level> I<N>"
@@ -5958,8 +5969,8 @@ msgstr "B<--check-dirname-level> I<N>"
#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73
#: ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95
#: ../scripts/debrelease.1:91 ../scripts/debrelease.1:95
-#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:437
-#: ../scripts/uscan.1:441
+#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:443
+#: ../scripts/uscan.1:447
msgid ""
"See the above section B<Directory name checking> for an explanation of this "
"option."
@@ -5970,7 +5981,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73
#: ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280
-#: ../scripts/uscan.1:437
+#: ../scripts/uscan.1:443
#, no-wrap
msgid "B<--check-dirname-regex> I<regex>"
msgstr "B<--check-dirname-regex> I<regulärer_Ausdruck>"
@@ -6196,18 +6207,18 @@ msgstr ""
"Konfigurationsdateivariable B<DEBCHANGE_RELEASE_HEURISTIC> gesteuert wird. "
"Die Standard-I<Changelog>-Entscheidungsregel geht davon aus, dass das Paket "
"veröffentlicht wurde, wenn sein Changelog im Feld »distribution« nicht "
-"B<UNRELEASED> enthält. Falls diese Entscheidungsregel aktiviert ist, wird die "
-"Distribution B<UNRELEASED> in neuen Changelog-Einträgen vorgeben und die "
-"nachfolgend beschriebene Option B<--mainttrailer> wird automatisch aktiviert. "
-"Dies kann nützlich sein, falls ein Paket durch verschiedene Paketbetreuer "
-"veröffentlicht werden kann oder falls Sie die Üpload-Protokolle nicht "
-"aufbewahren. Die alternative I<Protokoll>-Entscheidungsregel bestimmt, ob ein "
-"Paket veröffentlicht wurde, indem es im übergeordneten Verzeichnis eine "
-"geeignete B<dupload>(1)- oder B<dput>(1)-Protokolldatei sucht. Falls die "
-"Protokolldatei gefunden aber kein erfolgreiches Hochladen aufgezeichnet "
-"wurde, wird eine Warnung ausgegeben. Dies kann daher rühren, dass das "
-"vorhergehende Hochladen von einer Version von B<dupload> vor 2.1 durchgeführt "
-"wurde oder das Hochladen fehlschlug."
+"B<UNRELEASED> enthält. Falls diese Entscheidungsregel aktiviert ist, wird "
+"die Distribution B<UNRELEASED> in neuen Changelog-Einträgen vorgeben und die "
+"nachfolgend beschriebene Option B<--mainttrailer> wird automatisch "
+"aktiviert. Dies kann nützlich sein, falls ein Paket durch verschiedene "
+"Paketbetreuer veröffentlicht werden kann oder falls Sie die Üpload-"
+"Protokolle nicht aufbewahren. Die alternative I<Protokoll>-"
+"Entscheidungsregel bestimmt, ob ein Paket veröffentlicht wurde, indem es im "
+"übergeordneten Verzeichnis eine geeignete B<dupload>(1)- oder B<dput>(1)-"
+"Protokolldatei sucht. Falls die Protokolldatei gefunden aber kein "
+"erfolgreiches Hochladen aufgezeichnet wurde, wird eine Warnung ausgegeben. "
+"Dies kann daher rühren, dass das vorhergehende Hochladen von einer Version "
+"von B<dupload> vor 2.1 durchgeführt wurde oder das Hochladen fehlschlug."
#. type: Plain text
#: ../scripts/debchange.1:82
@@ -6402,16 +6413,16 @@ msgid ""
"changelog stanza with the new version."
msgstr ""
"Erhöht entweder den letzten Bestandteil der Debian-Veröffentlichungsnummer "
-"oder, falls dies ein natives Debian-Paket ist, die Versionsnummer. Für Ubuntu "
-"wird dies außerdem die Endung von »buildX« in »ubuntu1« ändern. Benutzen Sie "
-"B<-R> oder B<--rebuild> für ein Erhöhen ohne Änderung beim Neubauen. Dies "
-"erstellt am Anfang des Changelogs einen neuen Abschnitt mit geeigneten Kopf- "
-"und Fußzeilen. Falls dies eine neue Version eines nativen Debian-Pakets ist, "
-"wird außerdem der Verzeichnisname geändert, um dies widerzuspiegeln. Falls "
-"B<DEBCHANGE_RELEASE_HEURISTIC> I<changelog> (Vorgabe) und die aktuelle "
-"Veröffentlichung I<UNRELEASED> ist, wird dies nur die Version des aktuellen "
-"Changelog-Eintrags ändern. Andernfalls wird dies einen neuen "
-"Changelog-Eintrag mit der neuen Version erstellen."
+"oder, falls dies ein natives Debian-Paket ist, die Versionsnummer. Für "
+"Ubuntu wird dies außerdem die Endung von »buildX« in »ubuntu1« ändern. "
+"Benutzen Sie B<-R> oder B<--rebuild> für ein Erhöhen ohne Änderung beim "
+"Neubauen. Dies erstellt am Anfang des Changelogs einen neuen Abschnitt mit "
+"geeigneten Kopf- und Fußzeilen. Falls dies eine neue Version eines nativen "
+"Debian-Pakets ist, wird außerdem der Verzeichnisname geändert, um dies "
+"widerzuspiegeln. Falls B<DEBCHANGE_RELEASE_HEURISTIC> I<changelog> (Vorgabe) "
+"und die aktuelle Veröffentlichung I<UNRELEASED> ist, wird dies nur die "
+"Version des aktuellen Changelog-Eintrags ändern. Andernfalls wird dies einen "
+"neuen Changelog-Eintrag mit der neuen Version erstellen."
#. type: TP
#: ../scripts/debchange.1:162
@@ -6430,14 +6441,14 @@ msgid ""
"the current changelog stanza. Otherwise, this will create a new changelog "
"stanza with the new version."
msgstr ""
-"Dies gibt die Versionsnummer (einschließlich des "
-"Debian-Veröffentlichungsteils) explizit an und verhält sich ansonsten wie die "
+"Dies gibt die Versionsnummer (einschließlich des Debian-"
+"Veröffentlichungsteils) explizit an und verhält sich ansonsten wie die "
"Option B<--increment>. Es wird außerdem den Verzeichnisnamen ändern, falls "
"sich die Versionsnummer des Originalpakets geändert hat. Falls "
"B<DEBCHANGE_RELEASE_HEURISTIC> I<changelog> (Vorgabe) und die aktuelle "
"Veröffentlichung I<UNRELEASED> ist, wird dies nur die Version des aktuellen "
-"Changelog-Eintrags ändern. Andernfalls wird dies einen neuen "
-"Changelog-Eintrag mit der neuen Version erstellen."
+"Changelog-Eintrags ändern. Andernfalls wird dies einen neuen Changelog-"
+"Eintrag mit der neuen Version erstellen."
#. type: TP
#: ../scripts/debchange.1:172
@@ -6553,7 +6564,7 @@ msgstr ""
"nächsten Aufruf verursacht."
#. type: TP
-#: ../scripts/debchange.1:213 ../scripts/uscan.1:396
+#: ../scripts/debchange.1:213 ../scripts/uscan.1:402
#, no-wrap
msgid "B<--package> I<package>"
msgstr "B<--package> I<Paket>"
@@ -8016,14 +8027,10 @@ msgstr "debcommit - übergibt Änderungen an ein Paket"
#. type: textblock
#: ../scripts/debcommit.pl:9
-msgid ""
-"B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
-"message=>I<text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] [B<--"
-"changelog=>I<path>] [B<--all> | I<files to commit>]"
-msgstr ""
-"B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
-"message=>I<Text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] [B<--"
-"changelog=>I<Pfad>] [B<--all> | I<zu übergebende Dateien>]"
+#, fuzzy
+#| msgid "B<dscextract> [I<options>] I<dscfile> I<file>"
+msgid "B<debcommit> [I<options>] [B<--all> | I<files to commit>]"
+msgstr "B<dscextract> [I<Optionen>] I<dsc-Datei> I<Datei>"
#. type: textblock
#: ../scripts/debcommit.pl:13
@@ -8194,25 +8201,11 @@ msgstr ""
#. type: =item
#: ../scripts/debcommit.pl:76
-msgid "I<files to commit>"
-msgstr "I<zu übergebende Dateien>"
-
-#. type: textblock
-#: ../scripts/debcommit.pl:78
-msgid ""
-"Specify which files to commit (debian/changelog is added to the list "
-"automatically.)"
-msgstr ""
-"gibt an, welche Dateien übergeben werden sollen (debian/changelog wird der "
-"Liste automatisch hinzugefügt.)"
-
-#. type: =item
-#: ../scripts/debcommit.pl:81
msgid "B<-s>, B<--strip-message>, B<--no-strip-message>"
msgstr "B<-s>, B<--strip-message>, B<--no-strip-message>"
#. type: textblock
-#: ../scripts/debcommit.pl:83
+#: ../scripts/debcommit.pl:78
msgid ""
"If this option is set and the commit message has been derived from the "
"changelog, the characters \"* \" will be stripped from the beginning of the "
@@ -8223,7 +8216,7 @@ msgstr ""
"entfernt."
#. type: textblock
-#: ../scripts/debcommit.pl:87
+#: ../scripts/debcommit.pl:82
msgid ""
"This option is set by default and ignored if more than one line of the "
"message begins with \"[*+-] \"."
@@ -8232,12 +8225,12 @@ msgstr ""
"eine Zeile der Nachricht mit »[*+-] « beginnt."
#. type: =item
-#: ../scripts/debcommit.pl:90
+#: ../scripts/debcommit.pl:85
msgid "B<--sign-tags>, B<--no-sign-tags>"
msgstr "B<--sign-tags>, B<--no-sign-tags>"
#. type: textblock
-#: ../scripts/debcommit.pl:92
+#: ../scripts/debcommit.pl:87
msgid ""
"If this option is set, then tags that debcommit creates will be signed using "
"gnupg. Currently this is only supported by git."
@@ -8246,12 +8239,28 @@ msgstr ""
"erstellt, mittels GnuPG signiert. Derzeit wird dies nur von Git unterstützt."
#. type: =item
-#: ../scripts/debcommit.pl:107
+#: ../scripts/debcommit.pl:90
+#, fuzzy
+#| msgid "B<--changes>"
+msgid "B<--changelog-info>"
+msgstr "B<--changes>"
+
+#. type: textblock
+#: ../scripts/debcommit.pl:92
+msgid ""
+"If this option is set, the commit author and date will be determined from "
+"the Maintainer and Date field of the first paragraph in debian/changelog. "
+"This is mainly useful when using debchange(1) with the --no-mainttrailer "
+"option."
+msgstr ""
+
+#. type: =item
+#: ../scripts/debcommit.pl:109
msgid "B<DEBCOMMIT_STRIP_MESSAGE>"
msgstr "B<DEBCOMMIT_STRIP_MESSAGE>"
#. type: textblock
-#: ../scripts/debcommit.pl:109
+#: ../scripts/debcommit.pl:111
msgid ""
"If this is set to I<no>, then it is the same as the --no-strip-message "
"command line parameter being used. The default is I<yes>."
@@ -8260,12 +8269,12 @@ msgstr ""
"Befehlszeilenparameters --no-strip-message. Die Vorgabe ist I<yes>."
#. type: =item
-#: ../scripts/debcommit.pl:112
+#: ../scripts/debcommit.pl:114
msgid "B<DEBCOMMIT_SIGN_TAGS>"
msgstr "B<DEBCOMMIT_SIGN_TAGS>"
#. type: textblock
-#: ../scripts/debcommit.pl:114
+#: ../scripts/debcommit.pl:116
msgid ""
"If this is set to I<yes>, then it is the same as the --sign-tags command "
"line parameter being used. The default is I<no>."
@@ -8274,12 +8283,12 @@ msgstr ""
"Befehlszeilenparameter --sign-tags benutzt würde. Die Vorgabe ist I<no>."
#. type: =item
-#: ../scripts/debcommit.pl:117
+#: ../scripts/debcommit.pl:119
msgid "B<DEBCOMMIT_RELEASE_USE_CHANGELOG>"
msgstr "B<DEBCOMMIT_RELEASE_USE_CHANGELOG>"
#. type: textblock
-#: ../scripts/debcommit.pl:119
+#: ../scripts/debcommit.pl:121
msgid ""
"If this is set to I<yes>, then it is the same as the --release-use-changelog "
"command line parameter being used. The default is I<no>."
@@ -8289,13 +8298,13 @@ msgstr ""
"ist I<no>."
#. type: TP
-#: ../scripts/debcommit.pl:122 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:124 ../scripts/debsign.1:118
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr "B<DEBSIGN_KEYID>"
#. type: textblock
-#: ../scripts/debcommit.pl:124
+#: ../scripts/debcommit.pl:126
msgid ""
"This is the key id used for signing tags. If not set, a default will be "
"chosen by the revision control system."
@@ -8305,17 +8314,17 @@ msgstr ""
"Versionskontrollsystem ausgewählt."
#. type: =head1
-#: ../scripts/debcommit.pl:129
+#: ../scripts/debcommit.pl:131
msgid "VCS SPECIFIC FEATURES"
msgstr "VCS-SPEZIFISCHE FUNKTIONALITÄTEN"
#. type: =item
-#: ../scripts/debcommit.pl:133
+#: ../scripts/debcommit.pl:135
msgid "B<tla> / B<baz>"
msgstr "B<tla> / B<baz>"
#. type: textblock
-#: ../scripts/debcommit.pl:135
+#: ../scripts/debcommit.pl:137
msgid ""
"If the commit message contains more than 72 characters, a summary will be "
"created containing as many full words from the message as will fit within 72 "
@@ -8326,7 +8335,7 @@ msgstr ""
"enthält, wie in 72 Zeichen hineinpassen, gefolgt von Auslassungspunkten."
#. type: textblock
-#: ../scripts/debcommit.pl:141
+#: ../scripts/debcommit.pl:143
msgid ""
"Each of the features described below is applicable only if the commit "
"message has been automatically determined from the changelog."
@@ -8335,12 +8344,12 @@ msgstr ""
"Übertragungsnachricht automatisch aus dem Changelog bestimmt wurde."
#. type: =item
-#: ../scripts/debcommit.pl:146
+#: ../scripts/debcommit.pl:148
msgid "B<git>"
msgstr "B<git>"
#. type: textblock
-#: ../scripts/debcommit.pl:148
+#: ../scripts/debcommit.pl:150
msgid ""
"If only a single change is detected in the changelog, B<debcommit> will "
"unfold it to a single line and behave as if --strip-message was used."
@@ -8350,7 +8359,7 @@ msgstr ""
"ob --strip-message benutzt worden wäre."
#. type: textblock
-#: ../scripts/debcommit.pl:151
+#: ../scripts/debcommit.pl:153
msgid ""
"Otherwise, the first change will be unfolded and stripped to form a summary "
"line and a commit message formed using the summary line followed by a blank "
@@ -8364,12 +8373,12 @@ msgstr ""
"Nachricht vor der Übergabe abgestimmt werden kann."
#. type: =item
-#: ../scripts/debcommit.pl:156
+#: ../scripts/debcommit.pl:158
msgid "B<hg> / B<darcs>"
msgstr "B<hg> / B<darcs>"
#. type: textblock
-#: ../scripts/debcommit.pl:158
+#: ../scripts/debcommit.pl:160
msgid ""
"The first change detected in the changelog will be unfolded to form a single "
"line summary. If multiple changes were detected then an editor will be "
@@ -8380,12 +8389,12 @@ msgstr ""
"wird ein Editor geöffnet, der eine Feinabstimmung der Nachricht ermöglicht."
#. type: =item
-#: ../scripts/debcommit.pl:162
+#: ../scripts/debcommit.pl:164
msgid "B<bzr>"
msgstr "B<bzr>"
#. type: textblock
-#: ../scripts/debcommit.pl:164
+#: ../scripts/debcommit.pl:166
msgid ""
"If the changelog entry used for the commit message closes any bugs then --"
"fixes options to \"bzr commit\" will be generated to associate the revision "
@@ -8396,7 +8405,7 @@ msgstr ""
"generiert, um die Revision und die Fehler zu verknüpfen."
#. type: textblock
-#: ../scripts/debcommit.pl:849
+#: ../scripts/debcommit.pl:854
msgid ""
"This code is copyright by Joey Hess <joeyh at debian.org>, all rights "
"reserved. This program comes with ABSOLUTELY NO WARRANTY. You are free to "
@@ -8409,13 +8418,15 @@ msgstr ""
"License, Version 2 oder neuer, weitergeben."
#. type: textblock
-#: ../scripts/debcommit.pl:856 ../scripts/mass-bug.pl:522
+#: ../scripts/debcommit.pl:861 ../scripts/mass-bug.pl:522
msgid "Joey Hess <joeyh at debian.org>"
msgstr "Joey Hess <joeyh at debian.org>"
#. type: textblock
-#: ../scripts/debcommit.pl:860
-msgid "svnpath(1)."
+#: ../scripts/debcommit.pl:865
+#, fuzzy
+#| msgid "svnpath(1)."
+msgid "svnpath(1), debchange(1)."
msgstr "svnpath(1)"
#. type: TH
@@ -10539,7 +10550,7 @@ msgstr ""
#. type: TP
#: ../scripts/debsnap.1:42 ../doc/suspicious-source.1:38
-#: ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:66
+#: ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:65
#, no-wrap
msgid "B<-v>, B<--verbose>"
msgstr "B<-v>, B<--verbose>"
@@ -10649,7 +10660,7 @@ msgstr "falls nicht gesetzt, ist die Vorgabe I<http://snapshot.debian.org>"
#. type: SH
#: ../scripts/debsnap.1:86 ../scripts/dscextract.1:20
-#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:504
+#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:510
#: ../scripts/wnpp-check.1:25
#, no-wrap
msgid "EXIT STATUS"
@@ -10777,7 +10788,7 @@ msgstr "B<devscripts>(1), B<devscripts.conf>(5), B<git-debimport>(1)"
#. type: SH
#: ../scripts/debsnap.1:123 ../doc/edit-patch.1:37
#: ../doc/suspicious-source.1:51 ../doc/what-patch.1:27
-#: ../doc/wrap-and-sort.1:70
+#: ../doc/wrap-and-sort.1:69
#, no-wrap
msgid "AUTHORS"
msgstr "AUTOREN"
@@ -10962,7 +10973,7 @@ msgstr ""
"B<--check-dirname-regex> gesteuert."
#. type: Plain text
-#: ../scripts/debuild.1:86 ../scripts/uscan.1:321
+#: ../scripts/debuild.1:86 ../scripts/uscan.1:327
msgid ""
"The directory name is checked by testing whether the current directory name "
"(as determined by B<pwd>(1)) matches the regex given by the configuration "
@@ -11982,8 +11993,8 @@ msgstr ""
"B<DEBEMAIL> oder B<EMAIL> angegebenen unterschiedet, wird »Thanks to "
"I<Autor> E<lt>I<E-Mail>E<gt>« zum Changelog-Eintrag für den Patch "
"hinzugefügt. Alle B<bug-debian>- oder B<bug-ubuntu>-Felder werden dem "
-"Changelog-Eintrag als »Closes« hinzugefügt. Die erzeugten Einträge werden "
-"an B<debchange> als Argument neben den angegebenen I<Dch_Optionen> übergeben."
+"Changelog-Eintrag als »Closes« hinzugefügt. Die erzeugten Einträge werden an "
+"B<debchange> als Argument neben den angegebenen I<Dch_Optionen> übergeben."
#. type: Plain text
#: ../scripts/dep3changelog.1:28
@@ -12357,10 +12368,15 @@ msgstr "I<debcommit>(1)"
#. type: Plain text
#: ../scripts/devscripts.1:67
+#, fuzzy
+#| msgid ""
+#| "commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, basing "
+#| "commit message on changelog [cvs | darcs | subversion | svk | tla | bzr | "
+#| "git-core | mercurial]"
msgid ""
"commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, basing commit "
"message on changelog [cvs | darcs | subversion | svk | tla | bzr | git-core "
-"| mercurial]"
+"| mercurial, libtimedate-perl]"
msgstr ""
"übergibt Änderungen an cvs, darcs, svn, svk, tla, bzr, git oder hg, "
"basierend auf Nachrichten des Changelogs. [cvs | darcs | subversion | svk | "
@@ -14058,7 +14074,7 @@ msgstr ""
#. type: TP
#: ../scripts/dscextract.1:21 ../scripts/transition-check.pl:61
-#: ../scripts/uscan.1:508 ../scripts/wnpp-check.1:26
+#: ../scripts/uscan.1:514 ../scripts/wnpp-check.1:26
#, no-wrap
msgid "0"
msgstr "0"
@@ -14170,7 +14186,7 @@ msgstr ""
#. type: TP
#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78
-#: ../scripts/uscan.1:424
+#: ../scripts/uscan.1:430
#, no-wrap
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -15775,26 +15791,28 @@ msgstr ""
#: ../scripts/origtargz.pl:94
msgid ""
"Unpack the downloaded orig tarball to the current directory, replacing "
-"everything except the debian directory. Valid choices are:"
+"everything except the debian directory. Existing files are removed, except "
+"for F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-"
+"builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
msgstr ""
#. type: =item
-#: ../scripts/origtargz.pl:99
+#: ../scripts/origtargz.pl:101
msgid "B<no>"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:101
+#: ../scripts/origtargz.pl:103
msgid "Do not unpack the orig tarball."
msgstr ""
#. type: =item
-#: ../scripts/origtargz.pl:103
+#: ../scripts/origtargz.pl:105
msgid "B<once> (default when B<--unpack> is not used)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:105
+#: ../scripts/origtargz.pl:107
#, fuzzy
#| msgid ""
#| "Only check the directory name if we have had to change directory in our "
@@ -15807,17 +15825,16 @@ msgstr ""
"das Verzeichnis gewechselt werden muss. Dies ist das Standardverhalten."
#. type: =item
-#: ../scripts/origtargz.pl:108
+#: ../scripts/origtargz.pl:110
msgid "B<yes> (default for B<--unpack> without argument)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:110
-msgid ""
-"Always unpack the orig tarball. Existing files are removed, except for "
-"F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-"
-"builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
-msgstr ""
+#: ../scripts/origtargz.pl:112
+#, fuzzy
+#| msgid "Always check the directory name."
+msgid "Always unpack the orig tarball."
+msgstr "prüft den Verzeichnisnamen immer."
#. type: textblock
#: ../scripts/origtargz.pl:118
@@ -15840,14 +15857,28 @@ msgid ""
"to the next one. With B<--tar-only>, only download the F<.orig.tar.*> file."
msgstr ""
+#. type: =item
+#: ../scripts/origtargz.pl:127
+#, fuzzy
+#| msgid "B<--cleandebs>"
+msgid "B<--clean>"
+msgstr "B<--cleandebs>"
+
+#. type: textblock
+#: ../scripts/origtargz.pl:129
+msgid ""
+"Remove existing files as with B<--unpack>. Note that like B<--unpack>, this "
+"will remove upstream files even if they are stored in VCS."
+msgstr ""
+
#. type: textblock
-#: ../scripts/origtargz.pl:141
+#: ../scripts/origtargz.pl:146
msgid ""
"B<debcheckout>(1), B<git-import-orig>(1), B<svn-upgrade>(1), B<uupdate>(1)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:145
+#: ../scripts/origtargz.pl:150
#, fuzzy
#| msgid ""
#| "B<debcheckout> and this manpage have been written by Stefano Zacchiroli "
@@ -17120,7 +17151,7 @@ msgstr ""
"Leick E<lt>c.leick at vollbio.deE<gt>."
#. type: Plain text
-#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:74
+#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:73
msgid "Both are released under the ISC license."
msgstr "Beides wurde unter der ISC-Lizenz veröffentlicht."
@@ -17394,7 +17425,8 @@ msgstr "B<-t>, B<--to> I<Version>"
#: ../scripts/tagpending.pl:131
msgid "Parse changelogs for all versions strictly greater than I<version>."
msgstr ""
-"wertet Changelogs für alle Versionen aus, die echt größer als I<Version> sind."
+"wertet Changelogs für alle Versionen aus, die echt größer als I<Version> "
+"sind."
#. type: textblock
#: ../scripts/tagpending.pl:133
@@ -17731,7 +17763,15 @@ msgstr ""
"http://tmrc.mit.edu/mirror/twisted/Twisted/(\\ed\\e.\\ed)/Twisted-([\\ed\\e.]*)\\e.tar\\e.bz2\n"
#. type: Plain text
-#: ../scripts/uscan.1:75
+#: ../scripts/uscan.1:73
+#, no-wrap
+msgid ""
+"# For maximum flexibility with upstream tarball formats, use this:\n"
+"http://example.com/example-(\\d[\\d.]*)\\e.(?:zip|tgz|tbz2|txz|tar\\e.(?:gz|bz2|xz))\n"
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/uscan.1:78
#, no-wrap
msgid ""
"# qa.debian.org runs a redirector which allows a simpler form of URL\n"
@@ -17745,20 +17785,32 @@ msgstr ""
"http://sf.net/audacity/audacity-src-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:79
-#, no-wrap
+#: ../scripts/uscan.1:81
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# githubredir.debian.net is a redirector for GitHub projects\n"
+#| "# It can be used as following:\n"
+#| "http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
msgid ""
-"# githubredir.debian.net is a redirector for GitHub projects\n"
-"# It can be used as following:\n"
-"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
+"# For GitHub projects you can use the tags page:\n"
+"https://github.com/E<lt>userE<gt>/E<lt>projectE<gt>/tags .*/(\\ed[\\ed\\e.]*)\\e.tar\\e.gz\n"
msgstr ""
"# githubredir.debian.net ist ein Weiterleitungsdienst für GitHub-Projekte.\n"
"# Er kann wie folgt benutzt werden:\n"
"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
+#. type: Plain text
+#: ../scripts/uscan.1:85
+#, no-wrap
+msgid ""
+"# For Google Code projects you should use the downloads page like this:\n"
+"http://code.google.com/p/E<lt>projectE<gt>/downloads/list?can=1 \\e\n"
+" .*/E<lt>projectE<gt>-(\\ed[\\ed.]*)\\e.tar\\e.gz\n"
+msgstr ""
+
# FIXME s/sanitised/sanitized/
#. type: Plain text
-#: ../scripts/uscan.1:84
+#: ../scripts/uscan.1:90
#, no-wrap
msgid ""
"# This is the format for a site which has funny version numbers;\n"
@@ -17772,7 +17824,7 @@ msgstr ""
"http://www.site.com/pub/foobar/foobar_v(\\ed+)_(\\ed+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:92
+#: ../scripts/uscan.1:98
#, no-wrap
msgid ""
"# This is another way of handling site with funny version numbers,\n"
@@ -17792,7 +17844,7 @@ msgstr ""
" ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:97
+#: ../scripts/uscan.1:103
#, no-wrap
msgid ""
"# Similarly, the upstream part of the Debian version number can be\n"
@@ -17806,7 +17858,7 @@ msgstr ""
" http://some.site.org/some/path/foobar-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:110
+#: ../scripts/uscan.1:116
#, no-wrap
msgid ""
"# The filename is found by taking the last component of the URL and\n"
@@ -17838,7 +17890,7 @@ msgstr ""
"# gehandhabt werden.\n"
#. type: Plain text
-#: ../scripts/uscan.1:118
+#: ../scripts/uscan.1:124
#, no-wrap
msgid ""
"# The option downloadurlmangle can be used to mangle the URL of the file\n"
@@ -17859,7 +17911,7 @@ msgstr ""
"# http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n"
#. type: Plain text
-#: ../scripts/uscan.1:124
+#: ../scripts/uscan.1:130
msgid ""
"Comment lines may be introduced with a `B<#>' character. Continuation lines "
"may be indicated by terminating a line with a backslash character."
@@ -17868,7 +17920,7 @@ msgstr ""
"können mit einem abschließenden Rückwärtsschrägstrich fortgesetzt werden."
#. type: Plain text
-#: ../scripts/uscan.1:128
+#: ../scripts/uscan.1:134
msgid ""
"The first (non-comment) line of the file must begin `version=3'. This "
"allows for future extensions without having to change the name of the file."
@@ -17878,7 +17930,7 @@ msgstr ""
"geändert werden muss."
#. type: Plain text
-#: ../scripts/uscan.1:133
+#: ../scripts/uscan.1:139
msgid ""
"There are two possibilities for the syntax of an HTTP I<watch> file line, "
"and only one for an FTP line. We begin with the common (and simpler) "
@@ -17891,7 +17943,7 @@ msgstr ""
"im Folgenden ignoriert."
#. type: Plain text
-#: ../scripts/uscan.1:150
+#: ../scripts/uscan.1:156
msgid ""
"The first field gives the full pattern of URLs being searched for. In the "
"case of an FTP site, the directory listing for the requested directory will "
@@ -17928,7 +17980,7 @@ msgstr ""
"müssen die Klammern in jedem Pfadbestandteil passen.)"
#. type: Plain text
-#: ../scripts/uscan.1:159
+#: ../scripts/uscan.1:165
msgid ""
"The pattern (after the final slash) is a Perl regexp (see B<perlre>(1) for "
"details of these). You need to make the pattern so tight that it matches "
@@ -17949,7 +18001,7 @@ msgstr ""
"Gruppe enthalten, wie im nächsten Absatz erläutert."
#. type: Plain text
-#: ../scripts/uscan.1:170
+#: ../scripts/uscan.1:176
msgid ""
"Having got a list of `files' matching the pattern, their version numbers are "
"extracted by treating the part matching the Perl regexp groups, demarcated "
@@ -17975,7 +18027,7 @@ msgstr ""
# FIXME: s/--report-status/B<--report-status>/
#. type: Plain text
-#: ../scripts/uscan.1:187
+#: ../scripts/uscan.1:193
msgid ""
"The current (upstream) version can be specified as the second parameter in "
"the I<watch> file line. If this is I<debian> or absent, then the current "
@@ -18011,7 +18063,7 @@ msgstr ""
"beschrieben."
#. type: Plain text
-#: ../scripts/uscan.1:190
+#: ../scripts/uscan.1:196
msgid ""
"Finally, if a third parameter (an action) is given in the I<watch> file "
"line, this is taken as the name of a command, and the command"
@@ -18021,13 +18073,13 @@ msgstr ""
"der Befehl"
#. type: Plain text
-#: ../scripts/uscan.1:192
+#: ../scripts/uscan.1:198
#, no-wrap
msgid " I<command >B<--upstream-version>I< version filename>\n"
msgstr " I<Befehl >B<--upstream-version>I< Version Dateiname>\n"
#. type: Plain text
-#: ../scripts/uscan.1:201
+#: ../scripts/uscan.1:207
msgid ""
"is executed, using either the original file or the symlink name. A common "
"such command would be B<uupdate>(1). (Note that the calling syntax was "
@@ -18047,7 +18099,7 @@ msgstr ""
"Verweises bereits durch B<uscan> erledigt wurde."
#. type: Plain text
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
msgid ""
"The alternative version of the I<watch> file syntax for HTTP URLs is as "
"follows. The first field is a homepage which should be downloaded and then "
@@ -18082,13 +18134,13 @@ msgstr ""
"wie vorher."
#. type: SH
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
#, no-wrap
msgid "PER-SITE OPTIONS"
msgstr "OPTIONEN JE SITE"
#. type: Plain text
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
msgid ""
"A I<watch> file line may be prefixed with `B<opts=>I<options>', where "
"I<options> is a comma-separated list of options. The whole I<options> "
@@ -18102,13 +18154,13 @@ msgstr ""
"Leerzeichen enthalten. Folgende Optionen werden erkannt:"
#. type: TP
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
#, no-wrap
msgid "B<active> and B<passive> (or B<pasv>)"
msgstr "B<active> und B<passive> (oder B<pasv>)"
#. type: Plain text
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
msgid ""
"If used on an FTP line, these override the choice of whether to use PASV "
"mode or not, and force the use of the specified mode for this site."
@@ -18118,13 +18170,13 @@ msgstr ""
"Benutzung des angegebenen Modus für diese Site."
#. type: TP
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
#, no-wrap
msgid "B<uversionmangle=>I<rules>"
msgstr "B<uversionmangle=>I<Regeln>"
#. type: Plain text
-#: ../scripts/uscan.1:235
+#: ../scripts/uscan.1:241
msgid ""
"This is used to mangle the upstream version number as matched by the "
"ftp://... or http:// rules as follows. First, the I<rules> string is split "
@@ -18140,14 +18192,14 @@ msgstr ""
"Weise wie für das Ausführen des Perl-Befehls"
#. type: Plain text
-#: ../scripts/uscan.1:237
+#: ../scripts/uscan.1:243
#, no-wrap
msgid " $version =~ I<rule>;\n"
msgstr " $version =~ I<Regel>;\n"
# FIXME s/I<rules>/I<rule>/
#. type: Plain text
-#: ../scripts/uscan.1:242
+#: ../scripts/uscan.1:248
msgid ""
"for each rule. Thus, suitable rules might be `B<s/^/0./>' to prepend `B<0."
">' to the version number and `B<s/_/./g>' to change underscores into "
@@ -18160,7 +18212,7 @@ msgstr ""
"Zeichenkette Kommas enthalten kann; dies sollte kein Problem sein."
#. type: Plain text
-#: ../scripts/uscan.1:247
+#: ../scripts/uscan.1:253
msgid ""
"I<rule> may only use the 'B<s>', 'B<tr>' and 'B<y>' operations. When the "
"'B<s>' operation is used, only the 'B<g>', 'B<i>' and 'B<x>' flags are "
@@ -18175,7 +18227,7 @@ msgstr ""
"werden nicht unterstützt."
#. type: Plain text
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
msgid ""
"If the 'B<s>' operation is used, the replacement can contain backreferences "
"to expressions within parenthesis in the matching regexp, like `B<s/-alpha"
@@ -18188,13 +18240,13 @@ msgstr ""
"$1>«-Syntax verwenden, da die »B<\\e1>«-Syntax nicht unterstützt wird."
#. type: TP
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
#, no-wrap
msgid "B<dversionmangle=>I<rules>"
msgstr "B<dversionmangle=>I<Regeln>"
#. type: Plain text
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
msgid ""
"This is used to mangle the Debian version number of the currently installed "
"package in the same way as the B<uversionmangle> option. Thus, a suitable "
@@ -18212,13 +18264,13 @@ msgstr ""
"sollte kein Problem sein."
#. type: TP
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
#, no-wrap
msgid "B<versionmangle=>I<rules>"
msgstr "B<versionmangle=>I<Regeln>"
#. type: Plain text
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
msgid ""
"This is a syntactic shorthand for B<uversionmangle=>I<rules>B<,"
"dversionmangle=>I<rules>, applying the same rules to both the upstream and "
@@ -18229,13 +18281,13 @@ msgstr ""
"Versionsnummern der Ursprungsautoren als auch auf die von Debian an."
#. type: TP
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
#, no-wrap
msgid "B<filenamemangle=>I<rules>"
msgstr "B<filenamemangle=>I<Regeln>"
#. type: Plain text
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
msgid ""
"This is used to mangle the filename with which the downloaded file will be "
"saved, and is parsed in the same way as the B<uversionmangle> option. "
@@ -18247,13 +18299,13 @@ msgstr ""
"im vorhergehenden Abschnitt."
#. type: TP
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
#, no-wrap
msgid "B<downloadurlmangle=>I<rules>"
msgstr "B<downloadurlmangle=>I<Regeln>"
#. type: Plain text
-#: ../scripts/uscan.1:279
+#: ../scripts/uscan.1:285
msgid ""
"This is used to mangle the URL to be used for the download. The URL is "
"first computed based on the homepage downloaded and the pattern matched, "
@@ -18269,7 +18321,7 @@ msgstr ""
"Beispiel für die Verwendung findet sich im vorhergehenden Abschnitt."
#. type: Plain text
-#: ../scripts/uscan.1:294
+#: ../scripts/uscan.1:300
msgid ""
"Similarly to several other scripts in the B<devscripts> package, B<uscan> "
"explores the requested directory trees looking for I<debian/changelog> and "
@@ -18299,7 +18351,7 @@ msgstr ""
"gesteuert."
#. type: Plain text
-#: ../scripts/uscan.1:305
+#: ../scripts/uscan.1:311
msgid ""
"Only check the directory name if we have had to change directory in our "
"search for I<debian/changelog>, that is, the directory containing I<debian/"
@@ -18312,14 +18364,14 @@ msgstr ""
"aufgerufen wurde. Dies ist das Standardverhalten."
#. type: Plain text
-#: ../scripts/uscan.1:323
+#: ../scripts/uscan.1:329
msgid "This script will perform a fully automatic upstream update."
msgstr ""
"Dieses Skript wird eine vollautomatische Aktualisierung aus den "
"Ursprungsquellen durchführen."
#. type: Plain text
-#: ../scripts/uscan.1:331
+#: ../scripts/uscan.1:337
#, no-wrap
msgid ""
"#!/bin/sh -e\n"
@@ -18337,7 +18389,7 @@ msgstr ""
"debuild\n"
#. type: Plain text
-#: ../scripts/uscan.1:336
+#: ../scripts/uscan.1:342
msgid ""
"Note that we don't call B<dupload> or B<dput> automatically, as the "
"maintainer should perform sanity checks on the software before uploading it "
@@ -18348,26 +18400,26 @@ msgstr ""
"sollte, bevor sie nach Debian hochgeladen wird."
#. type: TP
-#: ../scripts/uscan.1:337
+#: ../scripts/uscan.1:343
#, no-wrap
msgid "B<--report>, B<--no-download>"
msgstr "B<--report>, B<--no-download>"
#. type: Plain text
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
msgid ""
"Only report about available newer versions but do not download anything."
msgstr ""
"berichtet nur über neue verfügbare Versionen, lädt aber nichts herunter."
#. type: TP
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
#, no-wrap
msgid "B<--report-status>"
msgstr "B<--report-status>"
#. type: Plain text
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
msgid ""
"Report on the status of all packages, even those which are up-to-date, but "
"do not download anything."
@@ -18376,24 +18428,24 @@ msgstr ""
"lädt aber nichts herunter."
#. type: TP
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
#, no-wrap
msgid "B<--download>"
msgstr "B<--download>"
#. type: Plain text
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
msgid "Report and download. (This is the default behaviour.)"
msgstr "berichtet und lädt herunter. (Dies ist das Standardverhalten.)"
#. type: TP
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
#, no-wrap
msgid "B<--destdir>"
msgstr "B<--destdir>"
#. type: Plain text
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
msgid ""
"Path of directory to which to download. If the specified path is not "
"absolute, it will be relative to one of the current directory or, if "
@@ -18405,13 +18457,13 @@ msgstr ""
"Quellverzeichnis des Pakets sein."
#. type: TP
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
#, no-wrap
msgid "B<--force-download>"
msgstr "B<--force-download>"
#. type: Plain text
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
msgid ""
"Download upstream even if up to date (will not overwrite local files, "
"however)"
@@ -18420,46 +18472,46 @@ msgstr ""
"jedoch keine lokalen Dateien überschreiben)."
#. type: TP
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
#, no-wrap
msgid "B<--pasv>"
msgstr "B<--pasv>"
#. type: Plain text
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
msgid "Force PASV mode for FTP connections."
msgstr "erzwingt bei FTP-Verbindungen den PASV-Modus."
#. type: TP
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
#, no-wrap
msgid "B<--no-pasv>"
msgstr "B<--no-pasv>"
#. type: Plain text
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
msgid "Do not use PASV mode for FTP connections."
msgstr "verwendet bei FTP-Verbindungen nicht den PASV-Modus."
#. type: TP
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
#, no-wrap
msgid "B<--timeout> I<N>"
msgstr "B<--timeout> I<N>"
#. type: Plain text
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
msgid "Set timeout to N seconds (default 20 seconds)."
msgstr "setzt die Zeitüberschreitung auf N Sekunden (Vorgabe 20 Sekunden)."
#. type: TP
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
#, no-wrap
msgid "B<--symlink>"
msgstr "B<--symlink>"
#. type: Plain text
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
msgid ""
"Make orig.tar.gz symlinks to any downloaded files if their extensions are I<."
"tar.gz> or I<.tgz>. This is also handled for orig.tar.bz2 (for upstream I<."
@@ -18475,13 +18527,13 @@ msgstr ""
"Ursprungsautoren) so gehandhabt. (Dies ist das Standardverhalten.)"
#. type: TP
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
#, no-wrap
msgid "B<--rename>"
msgstr "B<--rename>"
#. type: Plain text
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
msgid ""
"Instead of symlinking, rename the downloaded files to their Debian I<orig."
"tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma>, or I<orig.tar.xz> names as "
@@ -18492,13 +18544,13 @@ msgstr ""
"Namen um, anstatt symbolische Verweise darauf zu erstellen."
#. type: TP
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
#, no-wrap
msgid "B<--repack>"
msgstr "B<--repack>"
#. type: Plain text
-#: ../scripts/uscan.1:387
+#: ../scripts/uscan.1:393
msgid ""
"After having downloaded an lzma tar, xz tar, bzip tar or zip archive, repack "
"it to a gzip tar archive, which is still currently required as a member of a "
@@ -18518,37 +18570,37 @@ msgstr ""
"installiert sein, um LZMA- oder Xz-Archive neu zu packen."
#. type: TP
-#: ../scripts/uscan.1:387 ../scripts/uupdate.1:74
+#: ../scripts/uscan.1:393 ../scripts/uupdate.1:74
#, no-wrap
msgid "B<--no-symlink>"
msgstr "B<--no-symlink>"
#. type: Plain text
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
msgid "Don't make these symlinks and don't rename the files."
msgstr ""
"erstellt nicht diese symbolischen Verweise und benennt die Dateien nicht um."
#. type: TP
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
#, no-wrap
msgid "B<--dehs>"
msgstr "B<--dehs>"
#. type: Plain text
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
msgid "Use an XML format for output, as required by the DEHS system."
msgstr ""
"benutzt für die Ausgabe ein XML-Format, wie es vom DEHS-System benötigt wird."
#. type: TP
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
#, no-wrap
msgid "B<--no-dehs>"
msgstr "B<--no-dehs>"
#. type: Plain text
-#: ../scripts/uscan.1:396
+#: ../scripts/uscan.1:402
msgid ""
"Use the traditional uscan output format. (This is the default behaviour.)"
msgstr ""
@@ -18556,7 +18608,7 @@ msgstr ""
"Standardverhalten.)"
#. type: Plain text
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
msgid ""
"Specify the name of the package to check for rather than examining I<debian/"
"changelog>; this requires the B<--upstream-version> (unless a version is "
@@ -18573,13 +18625,13 @@ msgstr ""
"dehs>) an nützlichsten."
#. type: TP
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
#, no-wrap
msgid "B<--upstream-version> I<upstream-version>"
msgstr "B<--upstream-version> I<Version der Ursprungsautoren>"
#. type: Plain text
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
msgid ""
"Specify the current upstream version rather than examine the I<watch> file "
"or I<changelog> to determine it. This is ignored if a directory scan is "
@@ -18591,13 +18643,13 @@ msgstr ""
"gefunden wird."
#. type: TP
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
#, no-wrap
msgid "B<--watchfile> I<watchfile>"
msgstr "B<--watchfile> I<watch-Datei>"
#. type: Plain text
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
msgid ""
"Specify the I<watchfile> rather than perform a directory scan to determine "
"it. If this option is used without B<--package>, then B<uscan> must be "
@@ -18611,13 +18663,13 @@ msgstr ""
"gefunden werden kann)."
#. type: TP
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
#, no-wrap
msgid "B<--download-version> I<version>"
msgstr "B<--download-version> I<Version>"
#. type: Plain text
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
msgid ""
"Specify the version which the upstream release must match in order to be "
"considered, rather than using the release with the highest version."
@@ -18627,63 +18679,63 @@ msgstr ""
"berücksichtigt zu werden."
#. type: TP
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
#, no-wrap
msgid "B<--download-current-version>"
msgstr "B<--download-current-version>"
#. type: Plain text
-#: ../scripts/uscan.1:424
+#: ../scripts/uscan.1:430
msgid "Download the currently packaged version"
msgstr "lädt die aktuelle paketierte Version herunter."
#. type: Plain text
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
msgid "Give verbose output."
msgstr "erzeugt eine detaillierte Ausgabe."
#. type: TP
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
#, no-wrap
msgid "B<--no-verbose>"
msgstr "B<--no-verbose>"
#. type: Plain text
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
msgid "Don't give verbose output. (This is the default behaviour.)"
msgstr "erzeugt keine detaillierte Ausgabe. (Dies ist das Standardverhalten.)"
#. type: TP
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
#, no-wrap
msgid "B<--debug>"
msgstr "B<--debug>"
#. type: Plain text
-#: ../scripts/uscan.1:433
+#: ../scripts/uscan.1:439
msgid "Dump the downloaded web pages to stdout for debugging your watch file."
msgstr ""
"gibt die heruntergeladenen Webseiten auf der Standardausgabe für die "
"Fehlersuche in Ihrer Watch-Datei aus."
#. type: TP
-#: ../scripts/uscan.1:441
+#: ../scripts/uscan.1:447
#, no-wrap
msgid "B<--user-agent>, B<--useragent>"
msgstr "B<--user-agent>, B<--useragent>"
#. type: Plain text
-#: ../scripts/uscan.1:444
+#: ../scripts/uscan.1:450
msgid "Override the default user agent header."
msgstr "setzt die vorgegebene User-Agent-Kopfzeile außer Kraft. "
#. type: Plain text
-#: ../scripts/uscan.1:451
+#: ../scripts/uscan.1:457
msgid "Give brief usage information."
msgstr "gibt eine kurze Gebrauchsinformation."
#. type: Plain text
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
msgid ""
"The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are "
"sourced by a shell in that order to set configuration variables. These may "
@@ -18700,13 +18752,13 @@ msgstr ""
"werden diese Dateien nicht gelesen. Die derzeit bekannten Variablen sind:"
#. type: TP
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
#, no-wrap
msgid "B<USCAN_DOWNLOAD>"
msgstr "B<USCAN_DOWNLOAD>"
#. type: Plain text
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
msgid ""
"If this is set to I<no>, then newer upstream files will not be downloaded; "
"this is equivalent to the B<--report> or B<--no-download> options."
@@ -18716,13 +18768,13 @@ msgstr ""
"download>."
#. type: TP
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
#, no-wrap
msgid "B<USCAN_PASV>"
msgstr "B<USCAN_PASV>"
#. type: Plain text
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
msgid ""
"If this is set to I<yes> or I<no>, this will force FTP connections to use "
"PASV mode or not to, respectively. If this is set to I<default>, then "
@@ -18735,13 +18787,13 @@ msgstr ""
"(basiert hauptsächlich auf der Umgebungsvariable B<FTP_PASSIVE>)."
#. type: TP
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
#, no-wrap
msgid "B<USCAN_TIMEOUT>"
msgstr "B<USCAN_TIMEOUT>"
#. type: Plain text
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
msgid ""
"If set to a number I<N>, then set the timeout to I<N> seconds. This is "
"equivalent to the B<--timeout> option."
@@ -18750,13 +18802,13 @@ msgstr ""
"I<N> Sekunden eingestellt. Dies entspricht der Option B<--timeout>."
#. type: TP
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
#, no-wrap
msgid "B<USCAN_SYMLINK>"
msgstr "B<USCAN_SYMLINK>"
#. type: Plain text
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
msgid ""
"If this is set to I<no>, then a pkg_version.orig.tar.{gz|bz2|lzma|xz} "
"symlink will not be made (equivalent to the B<--no-symlink> option). If it "
@@ -18771,13 +18823,13 @@ msgstr ""
"die Dateien umbenannt (entspricht der Option B<--rename>)."
#. type: TP
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
#, no-wrap
msgid "B<USCAN_DEHS_OUTPUT>"
msgstr "B<USCAN_DEHS_OUTPUT>"
#. type: Plain text
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
msgid ""
"If this is set to I<yes>, then DEHS-style output will be used. This is "
"equivalent to the B<--dehs> option."
@@ -18786,13 +18838,13 @@ msgstr ""
"Dies entspricht der Option B<--dehs>."
#. type: TP
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
#, no-wrap
msgid "B<USCAN_VERBOSE>"
msgstr "B<USCAN_VERBOSE>"
#. type: Plain text
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
msgid ""
"If this is set to I<yes>, then verbose output will be given. This is "
"equivalent to the B<--verbose> option."
@@ -18801,13 +18853,13 @@ msgstr ""
"Dies entspricht der Option B<--verbose>."
#. type: TP
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
#, no-wrap
msgid "B<USCAN_USER_AGENT>"
msgstr "B<USCAN_USER_AGENT>"
#. type: Plain text
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
msgid ""
"If set, the specified user agent string will be used in place of the "
"default. This is equivalent to the B<--user-agent> option."
@@ -18816,13 +18868,13 @@ msgstr ""
"vorgegebenen benutzt. Dies entspricht der Option B<--user-agent>."
#. type: TP
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
#, no-wrap
msgid "B<USCAN_DESTDIR>"
msgstr "B<USCAN_DESTDIR>"
#. type: Plain text
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
msgid ""
"If set, the downloaded files will be placed in this directory. This is "
"equivalent to the B<--destdir> option."
@@ -18831,13 +18883,13 @@ msgstr ""
"abgelegt. Dies entspricht der Option B<--destdir>."
#. type: TP
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
#, no-wrap
msgid "B<USCAN_REPACK>"
msgstr "B<USCAN_REPACK>"
#. type: Plain text
-#: ../scripts/uscan.1:504
+#: ../scripts/uscan.1:510
msgid ""
"If this is set to I<yes>, then after having downloaded a bzip tar, lzma tar, "
"xz tar, or zip archive, B<uscan> will repack it to a gzip tar. This is "
@@ -18848,7 +18900,7 @@ msgstr ""
"packen. Dies entspricht der Option B<--repack>."
#. type: Plain text
-#: ../scripts/uscan.1:508
+#: ../scripts/uscan.1:514
msgid ""
"The exit status gives some indication of whether a newer version was found "
"or not; one is advised to read the output to determine exactly what happened "
@@ -18859,7 +18911,7 @@ msgstr ""
"was geschehen ist und ob irgendwelche Warnungen zu beachten sind."
#. type: Plain text
-#: ../scripts/uscan.1:512
+#: ../scripts/uscan.1:518
msgid ""
"Either B<--help> or B<--version> was used, or for some I<watch> file which "
"was examined, a newer upstream version was located."
@@ -18868,7 +18920,7 @@ msgstr ""
"untersuchte I<watch>-Datei eine neuere Version der Originalautoren gefunden."
#. type: Plain text
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
msgid ""
"No newer upstream versions were located for any of the I<watch> files "
"examined."
@@ -18877,13 +18929,13 @@ msgstr ""
"Ursprungsautoren gefunden."
#. type: SH
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
#, no-wrap
msgid "HISTORY AND UPGRADING"
msgstr "CHRONIK UND AKTUALISIERUNG"
#. type: Plain text
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
msgid ""
"This section briefly describes the backwards-incompatible I<watch> file "
"features which have been added in each I<watch> file version, and the first "
@@ -18894,13 +18946,13 @@ msgstr ""
"und die erste Version des Devscripts-Pakets, das sie verstand."
#. type: TP
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
#, no-wrap
msgid "I<Pre-version 2>"
msgstr "I<Vorversion 2>"
#. type: Plain text
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
msgid ""
"The I<watch> file syntax was significantly different in those days. Don't "
"use it. If you are upgrading from a pre-version 2 I<watch> file, you are "
@@ -18912,13 +18964,13 @@ msgstr ""
"Grund auf neu zu beginnen."
#. type: TP
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
#, no-wrap
msgid "I<Version 2>"
msgstr "I<Version 2>"
#. type: Plain text
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
msgid ""
"devscripts version 2.6.90: The first incarnation of the current style of "
"I<watch> files."
@@ -18927,13 +18979,13 @@ msgstr ""
"Dateistils"
#. type: TP
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
#, no-wrap
msgid "I<Version 3>"
msgstr "I<Version 3>"
#. type: Plain text
-#: ../scripts/uscan.1:535
+#: ../scripts/uscan.1:541
msgid ""
"devscripts version 2.8.12: Introduced the following: correct handling of "
"regex special characters in the path part, directory/path pattern matching, "
@@ -18946,7 +18998,7 @@ msgstr ""
"Versionen haben außerden URL-Mangling eingeführt."
#. type: Plain text
-#: ../scripts/uscan.1:541
+#: ../scripts/uscan.1:547
msgid ""
"If you are upgrading from version 2, the key incompatibility is if you have "
"multiple groups in the pattern part; whereas only the first one would be "
@@ -18962,12 +19014,12 @@ msgstr ""
"(...)-Gruppen sind."
#. type: Plain text
-#: ../scripts/uscan.1:547
+#: ../scripts/uscan.1:553
msgid "B<dpkg>(1), B<perlre>(1), B<uupdate>(1) and B<devscripts.conf>(5)."
msgstr "B<dpkg>(1), B<perlre>(1), B<uupdate>(1) und B<devscripts.conf>(5)"
#. type: Plain text
-#: ../scripts/uscan.1:552
+#: ../scripts/uscan.1:558
msgid ""
"The original version of B<uscan> was written by Christoph Lameter "
"E<lt>clameter at debian.orgE<gt>. Significant improvements, changes and "
@@ -19944,24 +19996,23 @@ msgstr ""
msgid "B<-a>, B<--wrap-always>"
msgstr "B<-a>, B<--wrap-always>"
-# FIXME s/line line/line/
#. type: Plain text
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
msgid ""
"Wrap all package lists in the Debian I<control> file even if the entries are "
-"shorter than 80 characters and could fit in one line line."
+"shorter than 80 characters and could fit in one line."
msgstr ""
"bricht alle Paketlisten in Debian-Steuerdateien um, sogar dann, wenn die "
"Einträge kürzer als 80 Zeichen sind und eine Zeile passen."
#. type: TP
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
#, no-wrap
msgid "B<-s>, B<--short-indent>"
msgstr "B<-s>, B<--short-indent>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
msgid ""
"Only indent wrapped lines by one space (default is in-line with the field "
"name)."
@@ -19970,24 +20021,24 @@ msgstr ""
"Zeile mit dem Feldnamen)."
#. type: TP
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
#, no-wrap
msgid "B<-b>, B<--sort-binary-packages>"
msgstr "B<-b>, B<--sort-binary-packages>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
msgid "Sort binary package paragraphs by name."
msgstr "sortiert Binärpaketabsätze nach Namen."
#. type: TP
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
#, no-wrap
msgid "B<-k>, B<--keep-first>"
msgstr "B<-k>, B<--keep-first>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
msgid ""
"When sorting binary package paragraphs, leave the first one at the top. "
"Unqualified B<debhelper>(7) configuration files are applied to the first "
@@ -19998,35 +20049,35 @@ msgstr ""
"angewandt."
#. type: TP
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
#, no-wrap
msgid "B<-n>, B<--no-cleanup>"
msgstr "B<-n>, B<--no-cleanup>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
msgid "Do not remove trailing whitespaces."
msgstr "entfernt nicht die abschließenden Leerräume."
#. type: TP
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
#, no-wrap
msgid "B<-d >I<path>, B<--debian-directory=>I<path>"
msgstr "B<-d >I<Pfad>, B<--debian-directory=>I<Pfad>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
msgid "Location of the I<debian> directory (default: I<./debian>)."
msgstr "Speicherort des I<debian>-Verzeichnisses (Vorgabe: I<./debian>)."
#. type: TP
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
#, no-wrap
msgid "B<-f >I<file>, B<--file=>I<file>"
msgstr "B<-f >I<Datei>, B<--file=>I<Datei>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:66
+#: ../doc/wrap-and-sort.1:65
msgid ""
"Wrap and sort only the specified I<file>. You can specify this parameter "
"multiple times. All supported files will be processed if no files are "
@@ -20037,12 +20088,12 @@ msgstr ""
"alle unterstützten Dateien verarbeitet."
#. type: Plain text
-#: ../doc/wrap-and-sort.1:69
+#: ../doc/wrap-and-sort.1:68
msgid "Print all files that are touched."
msgstr "gibt alle Dateien aus, die angefasst wurden."
#. type: Plain text
-#: ../doc/wrap-and-sort.1:73
+#: ../doc/wrap-and-sort.1:72
msgid ""
"B<wrap-and-sort> and this manpage have been written by Benjamin Drung "
"E<lt>bdrung at debian.orgE<gt>."
@@ -20177,9 +20228,10 @@ msgstr ""
"Aktionen durchgeführt werden. Derzeit werden diese Variablen von folgenden "
"Skripten verwendet: B<debc>, B<debchange>/B<dch>, B<debclean>, B<debi>, "
"B<debrelease>, B<debuild> und B<uscan>, aber diese Liste kann sich im Lauf "
-"der Zeit ändern (und die Aktualisierung dieser Handbuchseite könnte vergessen "
-"werden). Bitte lesen Sie die Handbuchseiten der jeweiligen Skripte, um "
-"Einzelheiten über das spezielle Verhalten für jedes Skript zu erfahren."
+"der Zeit ändern (und die Aktualisierung dieser Handbuchseite könnte "
+"vergessen werden). Bitte lesen Sie die Handbuchseiten der jeweiligen "
+"Skripte, um Einzelheiten über das spezielle Verhalten für jedes Skript zu "
+"erfahren."
#. type: Plain text
#: ../scripts/devscripts.conf.5:58
@@ -20195,3 +20247,22 @@ msgstr ""
"Diese Handbuchseite wurde für das Paket B<devscripts> durch den "
"Paketbetreuer Julian Gilbey E<lt>jdg at debian.orgE<gt> geschrieben. Die "
"deutsche Übersetzung verfasste Chris Leick E<lt>c.leick at vollbio.deE<gt>."
+
+#~ msgid ""
+#~ "B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
+#~ "message=>I<text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] "
+#~ "[B<--changelog=>I<path>] [B<--all> | I<files to commit>]"
+#~ msgstr ""
+#~ "B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
+#~ "message=>I<Text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] "
+#~ "[B<--changelog=>I<Pfad>] [B<--all> | I<zu übergebende Dateien>]"
+
+#~ msgid "I<files to commit>"
+#~ msgstr "I<zu übergebende Dateien>"
+
+#~ msgid ""
+#~ "Specify which files to commit (debian/changelog is added to the list "
+#~ "automatically.)"
+#~ msgstr ""
+#~ "gibt an, welche Dateien übergeben werden sollen (debian/changelog wird "
+#~ "der Liste automatisch hinzugefügt.)"
diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot
index 4069c7c..c9cfe1a 100644
--- a/po4a/po/devscripts.pot
+++ b/po4a/po/devscripts.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-10-21 00:40+0300\n"
+"POT-Creation-Date: 2012-12-19 22:36-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -70,7 +70,7 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:238 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:16 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:546 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:83 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:336 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33
+#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:238 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:16 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:546 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:83 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:342 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -98,7 +98,7 @@ msgid "Display a help message and exit successfully."
msgstr ""
#. type: SH
-#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:321
+#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:327
#, no-wrap
msgid "EXAMPLE"
msgstr ""
@@ -149,7 +149,7 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222 ../scripts/debclean.1:107 ../scripts/debcommit.pl:858 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:653 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:139 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/tagpending.pl:148 ../scripts/uscan.1:541 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54
+#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222 ../scripts/debclean.1:107 ../scripts/debcommit.pl:863 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:653 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:144 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/tagpending.pl:148 ../scripts/uscan.1:547 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -174,7 +174,7 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100 ../scripts/debc.1:120 ../scripts/debchange.1:476 ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111 ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:146 ../scripts/debuild.1:423 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:645 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:78 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:143 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:547 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58
+#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100 ../scripts/debc.1:120 ../scripts/debchange.1:476 ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111 ../scripts/debcommit.pl:859 ../scripts/debdiff.1:222 ../scripts/debi.1:136 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:146 ../scripts/debuild.1:423 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:645 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:78 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:148 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:553 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58
#, no-wrap
msgid "AUTHOR"
msgstr ""
@@ -814,13 +814,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/bts.pl:431 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:281 ../scripts/uscan.1:444 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40
+#: ../scripts/bts.pl:431 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:281 ../scripts/uscan.1:450 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40
#, no-wrap
msgid "B<--no-conf>, B<--noconf>"
msgstr ""
#. type: Plain text
-#: ../scripts/bts.pl:433 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:448 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44
+#: ../scripts/bts.pl:433 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:454 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44
msgid ""
"Do not read any configuration files. This can only be used as the first "
"option given on the command-line."
@@ -2084,13 +2084,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/bts.pl:4002 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:177 ../scripts/debclean.1:90 ../scripts/debcommit.pl:97 ../scripts/debdiff.1:167 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290 ../scripts/dget.pl:609 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:28 ../scripts/licensecheck.pl:96 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:290 ../scripts/uscan.1:454 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
+#: ../scripts/bts.pl:4002 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:177 ../scripts/debclean.1:90 ../scripts/debcommit.pl:99 ../scripts/debdiff.1:167 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290 ../scripts/dget.pl:609 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:28 ../scripts/licensecheck.pl:96 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:290 ../scripts/uscan.1:460 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
#, no-wrap
msgid "CONFIGURATION VARIABLES"
msgstr ""
#. type: textblock
-#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:99 ../scripts/licensecheck.pl:98 ../scripts/mass-bug.pl:134
+#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:101 ../scripts/licensecheck.pl:98 ../scripts/mass-bug.pl:134
msgid ""
"The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are "
"sourced by a shell in that order to set configuration variables. Command "
@@ -2434,7 +2434,7 @@ msgid "Run the debug mode"
msgstr ""
#. type: TP
-#: ../scripts/build-rdeps.pl:66 ../scripts/cowpoke.1:78 ../scripts/debclean.1:84 ../scripts/diff2patches.1:22 ../scripts/grep-excuses.1:22 ../scripts/mass-bug.pl:117 ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92 ../scripts/uscan.1:448
+#: ../scripts/build-rdeps.pl:66 ../scripts/cowpoke.1:78 ../scripts/debclean.1:84 ../scripts/diff2patches.1:22 ../scripts/grep-excuses.1:22 ../scripts/mass-bug.pl:117 ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92 ../scripts/uscan.1:454
#, no-wrap
msgid "B<--help>"
msgstr ""
@@ -2445,7 +2445,7 @@ msgid "Show the usage information."
msgstr ""
#. type: TP
-#: ../scripts/build-rdeps.pl:70 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:82 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:61 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:25 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:277 ../scripts/uscan.1:451 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
+#: ../scripts/build-rdeps.pl:70 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:82 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:61 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:25 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:277 ../scripts/uscan.1:457 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
#, no-wrap
msgid "B<--version>"
msgstr ""
@@ -2487,7 +2487,7 @@ msgid "and run apt-get update afterwards or use the update option of this tool."
msgstr ""
#. type: =head1
-#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:847 ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:120 ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89 ../scripts/transition-check.pl:72
+#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:852 ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:120 ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89 ../scripts/transition-check.pl:72
msgid "LICENSE"
msgstr ""
@@ -2550,7 +2550,7 @@ msgid "Choose architecture (default: `B<dpkg --print-architecture>`)."
msgstr ""
#. type: Plain text
-#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:123 ../scripts/uscan.1:454
+#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:123 ../scripts/uscan.1:460
msgid "Display version information."
msgstr ""
@@ -2843,7 +2843,7 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24 ../scripts/transition-check.pl:66 ../scripts/uscan.1:512 ../scripts/wnpp-check.1:29
+#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24 ../scripts/transition-check.pl:66 ../scripts/uscan.1:518 ../scripts/wnpp-check.1:29
#, no-wrap
msgid "1"
msgstr ""
@@ -2866,13 +2866,24 @@ msgid ""
"or not found. The warning message will give details."
msgstr ""
+#. type: TP
+#: ../scripts/checkbashisms.1:60
+#, no-wrap
+msgid "4"
+msgstr ""
+
#. type: Plain text
-#: ../scripts/checkbashisms.1:62
-msgid "B<lintian>(1)."
+#: ../scripts/checkbashisms.1:63
+msgid "No bashisms were detected in a bash script."
msgstr ""
#. type: Plain text
#: ../scripts/checkbashisms.1:65
+msgid "B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/checkbashisms.1:68
msgid ""
"B<checkbashisms> was originally written as a shell script by Yann Dirson "
"E<lt>I<dirson at debian.org>E<gt> and rewritten in Perl with many more features "
@@ -4471,7 +4482,7 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.1:279
+#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.1:285
#, no-wrap
msgid "Directory name checking"
msgstr ""
@@ -4491,23 +4502,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:296
+#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:302
msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:"
msgstr ""
#. type: TP
-#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:296
+#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:302
#, no-wrap
msgid "B<0>"
msgstr ""
#. type: Plain text
-#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:299
+#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:305
msgid "Never check the directory name."
msgstr ""
#. type: TP
-#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:299
+#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:305
#, no-wrap
msgid "B<1>"
msgstr ""
@@ -4520,13 +4531,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.1:305
+#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.1:311
#, no-wrap
msgid "B<2>"
msgstr ""
#. type: Plain text
-#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.1:308
+#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.1:314
msgid "Always check the directory name."
msgstr ""
@@ -4561,20 +4572,20 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69 ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276 ../scripts/uscan.1:433
+#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69 ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276 ../scripts/uscan.1:439
#, no-wrap
msgid "B<--check-dirname-level> I<N>"
msgstr ""
#. type: Plain text
-#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:437 ../scripts/uscan.1:441
+#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:443 ../scripts/uscan.1:447
msgid ""
"See the above section B<Directory name checking> for an explanation of this "
"option."
msgstr ""
#. type: TP
-#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73 ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280 ../scripts/uscan.1:437
+#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73 ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280 ../scripts/uscan.1:443
#, no-wrap
msgid "B<--check-dirname-regex> I<regex>"
msgstr ""
@@ -4953,7 +4964,7 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/debchange.1:213 ../scripts/uscan.1:396
+#: ../scripts/debchange.1:213 ../scripts/uscan.1:402
#, no-wrap
msgid "B<--package> I<package>"
msgstr ""
@@ -6104,10 +6115,7 @@ msgstr ""
#. type: textblock
#: ../scripts/debcommit.pl:9
-msgid ""
-"B<debcommit> [B<--release>] [B<--release-use-changelog>] "
-"[B<--message=>I<text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] "
-"[B<--changelog=>I<path>] [B<--all> | I<files to commit>]"
+msgid "B<debcommit> [I<options>] [B<--all> | I<files to commit>]"
msgstr ""
#. type: textblock
@@ -6242,23 +6250,11 @@ msgstr ""
#. type: =item
#: ../scripts/debcommit.pl:76
-msgid "I<files to commit>"
-msgstr ""
-
-#. type: textblock
-#: ../scripts/debcommit.pl:78
-msgid ""
-"Specify which files to commit (debian/changelog is added to the list "
-"automatically.)"
-msgstr ""
-
-#. type: =item
-#: ../scripts/debcommit.pl:81
msgid "B<-s>, B<--strip-message>, B<--no-strip-message>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:83
+#: ../scripts/debcommit.pl:78
msgid ""
"If this option is set and the commit message has been derived from the "
"changelog, the characters \"* \" will be stripped from the beginning of the "
@@ -6266,85 +6262,99 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:87
+#: ../scripts/debcommit.pl:82
msgid ""
"This option is set by default and ignored if more than one line of the "
"message begins with \"[*+-] \"."
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:90
+#: ../scripts/debcommit.pl:85
msgid "B<--sign-tags>, B<--no-sign-tags>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:92
+#: ../scripts/debcommit.pl:87
msgid ""
"If this option is set, then tags that debcommit creates will be signed using "
"gnupg. Currently this is only supported by git."
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:107
-msgid "B<DEBCOMMIT_STRIP_MESSAGE>"
+#: ../scripts/debcommit.pl:90
+msgid "B<--changelog-info>"
msgstr ""
#. type: textblock
+#: ../scripts/debcommit.pl:92
+msgid ""
+"If this option is set, the commit author and date will be determined from "
+"the Maintainer and Date field of the first paragraph in debian/changelog. "
+"This is mainly useful when using debchange(1) with the --no-mainttrailer "
+"option."
+msgstr ""
+
+#. type: =item
#: ../scripts/debcommit.pl:109
+msgid "B<DEBCOMMIT_STRIP_MESSAGE>"
+msgstr ""
+
+#. type: textblock
+#: ../scripts/debcommit.pl:111
msgid ""
"If this is set to I<no>, then it is the same as the --no-strip-message "
"command line parameter being used. The default is I<yes>."
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:112
+#: ../scripts/debcommit.pl:114
msgid "B<DEBCOMMIT_SIGN_TAGS>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:114
+#: ../scripts/debcommit.pl:116
msgid ""
"If this is set to I<yes>, then it is the same as the --sign-tags command "
"line parameter being used. The default is I<no>."
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:117
+#: ../scripts/debcommit.pl:119
msgid "B<DEBCOMMIT_RELEASE_USE_CHANGELOG>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:119
+#: ../scripts/debcommit.pl:121
msgid ""
"If this is set to I<yes>, then it is the same as the --release-use-changelog "
"command line parameter being used. The default is I<no>."
msgstr ""
#. type: TP
-#: ../scripts/debcommit.pl:122 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:124 ../scripts/debsign.1:118
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:124
+#: ../scripts/debcommit.pl:126
msgid ""
"This is the key id used for signing tags. If not set, a default will be "
"chosen by the revision control system."
msgstr ""
#. type: =head1
-#: ../scripts/debcommit.pl:129
+#: ../scripts/debcommit.pl:131
msgid "VCS SPECIFIC FEATURES"
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:133
+#: ../scripts/debcommit.pl:135
msgid "B<tla> / B<baz>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:135
+#: ../scripts/debcommit.pl:137
msgid ""
"If the commit message contains more than 72 characters, a summary will be "
"created containing as many full words from the message as will fit within 72 "
@@ -6352,26 +6362,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:141
+#: ../scripts/debcommit.pl:143
msgid ""
"Each of the features described below is applicable only if the commit "
"message has been automatically determined from the changelog."
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:146
+#: ../scripts/debcommit.pl:148
msgid "B<git>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:148
+#: ../scripts/debcommit.pl:150
msgid ""
"If only a single change is detected in the changelog, B<debcommit> will "
"unfold it to a single line and behave as if --strip-message was used."
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:151
+#: ../scripts/debcommit.pl:153
msgid ""
"Otherwise, the first change will be unfolded and stripped to form a summary "
"line and a commit message formed using the summary line followed by a blank "
@@ -6380,12 +6390,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:156
+#: ../scripts/debcommit.pl:158
msgid "B<hg> / B<darcs>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:158
+#: ../scripts/debcommit.pl:160
msgid ""
"The first change detected in the changelog will be unfolded to form a single "
"line summary. If multiple changes were detected then an editor will be "
@@ -6393,12 +6403,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../scripts/debcommit.pl:162
+#: ../scripts/debcommit.pl:164
msgid "B<bzr>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:164
+#: ../scripts/debcommit.pl:166
msgid ""
"If the changelog entry used for the commit message closes any bugs then "
"--fixes options to \"bzr commit\" will be generated to associate the "
@@ -6406,7 +6416,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:849
+#: ../scripts/debcommit.pl:854
msgid ""
"This code is copyright by Joey Hess <joeyh at debian.org>, all rights "
"reserved. This program comes with ABSOLUTELY NO WARRANTY. You are free to "
@@ -6415,13 +6425,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:856 ../scripts/mass-bug.pl:522
+#: ../scripts/debcommit.pl:861 ../scripts/mass-bug.pl:522
msgid "Joey Hess <joeyh at debian.org>"
msgstr ""
#. type: textblock
-#: ../scripts/debcommit.pl:860
-msgid "svnpath(1)."
+#: ../scripts/debcommit.pl:865
+msgid "svnpath(1), debchange(1)."
msgstr ""
#. type: TH
@@ -8077,7 +8087,7 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/debsnap.1:42 ../doc/suspicious-source.1:38 ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:66
+#: ../scripts/debsnap.1:42 ../doc/suspicious-source.1:38 ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:65
#, no-wrap
msgid "B<-v>, B<--verbose>"
msgstr ""
@@ -8173,7 +8183,7 @@ msgid "If unset this defaults to I<http://snapshot.debian.org>"
msgstr ""
#. type: SH
-#: ../scripts/debsnap.1:86 ../scripts/dscextract.1:20 ../scripts/transition-check.pl:54 ../scripts/uscan.1:504 ../scripts/wnpp-check.1:25
+#: ../scripts/debsnap.1:86 ../scripts/dscextract.1:20 ../scripts/transition-check.pl:54 ../scripts/uscan.1:510 ../scripts/wnpp-check.1:25
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
@@ -8280,7 +8290,7 @@ msgid "B<devscripts>(1), B<devscripts.conf>(5), B<git-debimport>(1)"
msgstr ""
#. type: SH
-#: ../scripts/debsnap.1:123 ../doc/edit-patch.1:37 ../doc/suspicious-source.1:51 ../doc/what-patch.1:27 ../doc/wrap-and-sort.1:70
+#: ../scripts/debsnap.1:123 ../doc/edit-patch.1:37 ../doc/suspicious-source.1:51 ../doc/what-patch.1:27 ../doc/wrap-and-sort.1:69
#, no-wrap
msgid "AUTHORS"
msgstr ""
@@ -8409,7 +8419,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/debuild.1:86 ../scripts/uscan.1:321
+#: ../scripts/debuild.1:86 ../scripts/uscan.1:327
msgid ""
"The directory name is checked by testing whether the current directory name "
"(as determined by B<pwd>(1)) matches the regex given by the configuration "
@@ -9512,7 +9522,7 @@ msgstr ""
msgid ""
"commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, basing commit "
"message on changelog [cvs | darcs | subversion | svk | tla | bzr | git-core "
-"| mercurial]"
+"| mercurial, libtimedate-perl]"
msgstr ""
#. type: IP
@@ -10923,7 +10933,7 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/dscextract.1:21 ../scripts/transition-check.pl:61 ../scripts/uscan.1:508 ../scripts/wnpp-check.1:26
+#: ../scripts/dscextract.1:21 ../scripts/transition-check.pl:61 ../scripts/uscan.1:514 ../scripts/wnpp-check.1:26
#, no-wrap
msgid "0"
msgstr ""
@@ -11018,7 +11028,7 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 ../scripts/uscan.1:424
+#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 ../scripts/uscan.1:430
#, no-wrap
msgid "B<--verbose>"
msgstr ""
@@ -12328,42 +12338,41 @@ msgstr ""
#: ../scripts/origtargz.pl:94
msgid ""
"Unpack the downloaded orig tarball to the current directory, replacing "
-"everything except the debian directory. Valid choices are:"
+"everything except the debian directory. Existing files are removed, except "
+"for F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, "
+"F<.bzr-builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
msgstr ""
#. type: =item
-#: ../scripts/origtargz.pl:99
+#: ../scripts/origtargz.pl:101
msgid "B<no>"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:101
+#: ../scripts/origtargz.pl:103
msgid "Do not unpack the orig tarball."
msgstr ""
#. type: =item
-#: ../scripts/origtargz.pl:103
+#: ../scripts/origtargz.pl:105
msgid "B<once> (default when B<--unpack> is not used)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:105
+#: ../scripts/origtargz.pl:107
msgid ""
"If the current directory contains only a F<debian> directory (and possibly "
"some dotfiles), unpack the orig tarball. This is the default behavior."
msgstr ""
#. type: =item
-#: ../scripts/origtargz.pl:108
+#: ../scripts/origtargz.pl:110
msgid "B<yes> (default for B<--unpack> without argument)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:110
-msgid ""
-"Always unpack the orig tarball. Existing files are removed, except for "
-"F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, "
-"F<.bzr-builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
+#: ../scripts/origtargz.pl:112
+msgid "Always unpack the orig tarball."
msgstr ""
#. type: textblock
@@ -12386,13 +12395,25 @@ msgid ""
"file."
msgstr ""
+#. type: =item
+#: ../scripts/origtargz.pl:127
+msgid "B<--clean>"
+msgstr ""
+
#. type: textblock
-#: ../scripts/origtargz.pl:141
+#: ../scripts/origtargz.pl:129
+msgid ""
+"Remove existing files as with B<--unpack>. Note that like B<--unpack>, this "
+"will remove upstream files even if they are stored in VCS."
+msgstr ""
+
+#. type: textblock
+#: ../scripts/origtargz.pl:146
msgid "B<debcheckout>(1), B<git-import-orig>(1), B<svn-upgrade>(1), B<uupdate>(1)"
msgstr ""
#. type: textblock
-#: ../scripts/origtargz.pl:145
+#: ../scripts/origtargz.pl:150
msgid ""
"B<origtargz> and this manpage have been written by Christoph Berg "
"<I<myon at debian.org>>."
@@ -13427,7 +13448,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:74
+#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:73
msgid "Both are released under the ISC license."
msgstr ""
@@ -13908,7 +13929,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:75
+#: ../scripts/uscan.1:73
+#, no-wrap
+msgid ""
+"# For maximum flexibility with upstream tarball formats, use this:\n"
+"http://example.com/example-(\\d[\\d.]*)\\e.(?:zip|tgz|tbz2|txz|tar\\e.(?:gz|bz2|xz))\n"
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/uscan.1:78
#, no-wrap
msgid ""
"# qa.debian.org runs a redirector which allows a simpler form of URL\n"
@@ -13918,17 +13947,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:79
+#: ../scripts/uscan.1:81
+#, no-wrap
+msgid ""
+"# For GitHub projects you can use the tags page:\n"
+"https://github.com/E<lt>userE<gt>/E<lt>projectE<gt>/tags "
+".*/(\\ed[\\ed\\e.]*)\\e.tar\\e.gz\n"
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/uscan.1:85
#, no-wrap
msgid ""
-"# githubredir.debian.net is a redirector for GitHub projects\n"
-"# It can be used as following:\n"
-"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> "
-"(.+).tar.gz\n"
+"# For Google Code projects you should use the downloads page like this:\n"
+"http://code.google.com/p/E<lt>projectE<gt>/downloads/list?can=1 \\e\n"
+" .*/E<lt>projectE<gt>-(\\ed[\\ed.]*)\\e.tar\\e.gz\n"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:84
+#: ../scripts/uscan.1:90
#, no-wrap
msgid ""
"# This is the format for a site which has funny version numbers;\n"
@@ -13938,7 +13975,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:92
+#: ../scripts/uscan.1:98
#, no-wrap
msgid ""
"# This is another way of handling site with funny version numbers,\n"
@@ -13952,7 +13989,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:97
+#: ../scripts/uscan.1:103
#, no-wrap
msgid ""
"# Similarly, the upstream part of the Debian version number can be\n"
@@ -13962,7 +13999,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:110
+#: ../scripts/uscan.1:116
#, no-wrap
msgid ""
"# The filename is found by taking the last component of the URL and\n"
@@ -13982,7 +14019,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:118
+#: ../scripts/uscan.1:124
#, no-wrap
msgid ""
"# The option downloadurlmangle can be used to mangle the URL of the file\n"
@@ -13995,21 +14032,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:124
+#: ../scripts/uscan.1:130
msgid ""
"Comment lines may be introduced with a `B<#>' character. Continuation lines "
"may be indicated by terminating a line with a backslash character."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:128
+#: ../scripts/uscan.1:134
msgid ""
"The first (non-comment) line of the file must begin `version=3'. This "
"allows for future extensions without having to change the name of the file."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:133
+#: ../scripts/uscan.1:139
msgid ""
"There are two possibilities for the syntax of an HTTP I<watch> file line, "
"and only one for an FTP line. We begin with the common (and simpler) "
@@ -14018,7 +14055,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:150
+#: ../scripts/uscan.1:156
msgid ""
"The first field gives the full pattern of URLs being searched for. In the "
"case of an FTP site, the directory listing for the requested directory will "
@@ -14038,7 +14075,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:159
+#: ../scripts/uscan.1:165
msgid ""
"The pattern (after the final slash) is a Perl regexp (see B<perlre>(1) for "
"details of these). You need to make the pattern so tight that it matches "
@@ -14050,7 +14087,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:170
+#: ../scripts/uscan.1:176
msgid ""
"Having got a list of `files' matching the pattern, their version numbers are "
"extracted by treating the part matching the Perl regexp groups, demarcated "
@@ -14064,7 +14101,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:187
+#: ../scripts/uscan.1:193
msgid ""
"The current (upstream) version can be specified as the second parameter in "
"the I<watch> file line. If this is I<debian> or absent, then the current "
@@ -14083,20 +14120,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:190
+#: ../scripts/uscan.1:196
msgid ""
"Finally, if a third parameter (an action) is given in the I<watch> file "
"line, this is taken as the name of a command, and the command"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:192
+#: ../scripts/uscan.1:198
#, no-wrap
msgid " I<command >B<--upstream-version>I< version filename>\n"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:201
+#: ../scripts/uscan.1:207
msgid ""
"is executed, using either the original file or the symlink name. A common "
"such command would be B<uupdate>(1). (Note that the calling syntax was "
@@ -14108,7 +14145,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
msgid ""
"The alternative version of the I<watch> file syntax for HTTP URLs is as "
"follows. The first field is a homepage which should be downloaded and then "
@@ -14127,13 +14164,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
#, no-wrap
msgid "PER-SITE OPTIONS"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
msgid ""
"A I<watch> file line may be prefixed with `B<opts=>I<options>', where "
"I<options> is a comma-separated list of options. The whole I<options> "
@@ -14142,26 +14179,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
#, no-wrap
msgid "B<active> and B<passive> (or B<pasv>)"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
msgid ""
"If used on an FTP line, these override the choice of whether to use PASV "
"mode or not, and force the use of the specified mode for this site."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
#, no-wrap
msgid "B<uversionmangle=>I<rules>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:235
+#: ../scripts/uscan.1:241
msgid ""
"This is used to mangle the upstream version number as matched by the "
"ftp://... or http:// rules as follows. First, the I<rules> string is split "
@@ -14171,13 +14208,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:237
+#: ../scripts/uscan.1:243
#, no-wrap
msgid " $version =~ I<rule>;\n"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:242
+#: ../scripts/uscan.1:248
msgid ""
"for each rule. Thus, suitable rules might be `B<s/^/0./>' to prepend "
"`B<0.>' to the version number and `B<s/_/./g>' to change underscores into "
@@ -14186,7 +14223,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:247
+#: ../scripts/uscan.1:253
msgid ""
"I<rule> may only use the 'B<s>', 'B<tr>' and 'B<y>' operations. When the "
"'B<s>' operation is used, only the 'B<g>', 'B<i>' and 'B<x>' flags are "
@@ -14196,7 +14233,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
msgid ""
"If the 'B<s>' operation is used, the replacement can contain backreferences "
"to expressions within parenthesis in the matching regexp, like "
@@ -14205,13 +14242,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
#, no-wrap
msgid "B<dversionmangle=>I<rules>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
msgid ""
"This is used to mangle the Debian version number of the currently installed "
"package in the same way as the B<uversionmangle> option. Thus, a suitable "
@@ -14222,13 +14259,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
#, no-wrap
msgid "B<versionmangle=>I<rules>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
msgid ""
"This is a syntactic shorthand for "
"B<uversionmangle=>I<rules>B<,dversionmangle=>I<rules>, applying the same "
@@ -14236,13 +14273,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
#, no-wrap
msgid "B<filenamemangle=>I<rules>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
msgid ""
"This is used to mangle the filename with which the downloaded file will be "
"saved, and is parsed in the same way as the B<uversionmangle> option. "
@@ -14250,13 +14287,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
#, no-wrap
msgid "B<downloadurlmangle=>I<rules>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:279
+#: ../scripts/uscan.1:285
msgid ""
"This is used to mangle the URL to be used for the download. The URL is "
"first computed based on the homepage downloaded and the pattern matched, "
@@ -14266,7 +14303,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:294
+#: ../scripts/uscan.1:300
msgid ""
"Similarly to several other scripts in the B<devscripts> package, B<uscan> "
"explores the requested directory trees looking for I<debian/changelog> and "
@@ -14283,7 +14320,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:305
+#: ../scripts/uscan.1:311
msgid ""
"Only check the directory name if we have had to change directory in our "
"search for I<debian/changelog>, that is, the directory containing "
@@ -14292,12 +14329,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:323
+#: ../scripts/uscan.1:329
msgid "This script will perform a fully automatic upstream update."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:331
+#: ../scripts/uscan.1:337
#, no-wrap
msgid ""
"#!/bin/sh -e\n"
@@ -14309,7 +14346,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:336
+#: ../scripts/uscan.1:342
msgid ""
"Note that we don't call B<dupload> or B<dput> automatically, as the "
"maintainer should perform sanity checks on the software before uploading it "
@@ -14317,48 +14354,48 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:337
+#: ../scripts/uscan.1:343
#, no-wrap
msgid "B<--report>, B<--no-download>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
msgid "Only report about available newer versions but do not download anything."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
#, no-wrap
msgid "B<--report-status>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
msgid ""
"Report on the status of all packages, even those which are up-to-date, but "
"do not download anything."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
#, no-wrap
msgid "B<--download>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
msgid "Report and download. (This is the default behaviour.)"
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
#, no-wrap
msgid "B<--destdir>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
msgid ""
"Path of directory to which to download. If the specified path is not "
"absolute, it will be relative to one of the current directory or, if "
@@ -14366,59 +14403,59 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
#, no-wrap
msgid "B<--force-download>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
msgid ""
"Download upstream even if up to date (will not overwrite local files, "
"however)"
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
#, no-wrap
msgid "B<--pasv>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
msgid "Force PASV mode for FTP connections."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
#, no-wrap
msgid "B<--no-pasv>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
msgid "Do not use PASV mode for FTP connections."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
#, no-wrap
msgid "B<--timeout> I<N>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
msgid "Set timeout to N seconds (default 20 seconds)."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
#, no-wrap
msgid "B<--symlink>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
msgid ""
"Make orig.tar.gz symlinks to any downloaded files if their extensions are "
"I<.tar.gz> or I<.tgz>. This is also handled for orig.tar.bz2 (for upstream "
@@ -14428,13 +14465,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
#, no-wrap
msgid "B<--rename>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
msgid ""
"Instead of symlinking, rename the downloaded files to their Debian "
"I<orig.tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma>, or I<orig.tar.xz> names "
@@ -14442,13 +14479,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
#, no-wrap
msgid "B<--repack>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:387
+#: ../scripts/uscan.1:393
msgid ""
"After having downloaded an lzma tar, xz tar, bzip tar or zip archive, repack "
"it to a gzip tar archive, which is still currently required as a member of a "
@@ -14461,40 +14498,40 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:387 ../scripts/uupdate.1:74
+#: ../scripts/uscan.1:393 ../scripts/uupdate.1:74
#, no-wrap
msgid "B<--no-symlink>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
msgid "Don't make these symlinks and don't rename the files."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
#, no-wrap
msgid "B<--dehs>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
msgid "Use an XML format for output, as required by the DEHS system."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
#, no-wrap
msgid "B<--no-dehs>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:396
+#: ../scripts/uscan.1:402
msgid "Use the traditional uscan output format. (This is the default behaviour.)"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
msgid ""
"Specify the name of the package to check for rather than examining "
"I<debian/changelog>; this requires the B<--upstream-version> (unless a "
@@ -14505,13 +14542,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
#, no-wrap
msgid "B<--upstream-version> I<upstream-version>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
msgid ""
"Specify the current upstream version rather than examine the I<watch> file "
"or I<changelog> to determine it. This is ignored if a directory scan is "
@@ -14519,13 +14556,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
#, no-wrap
msgid "B<--watchfile> I<watchfile>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
msgid ""
"Specify the I<watchfile> rather than perform a directory scan to determine "
"it. If this option is used without B<--package>, then B<uscan> must be "
@@ -14534,74 +14571,74 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
#, no-wrap
msgid "B<--download-version> I<version>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
msgid ""
"Specify the version which the upstream release must match in order to be "
"considered, rather than using the release with the highest version."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
#, no-wrap
msgid "B<--download-current-version>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:424
+#: ../scripts/uscan.1:430
msgid "Download the currently packaged version"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
msgid "Give verbose output."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
#, no-wrap
msgid "B<--no-verbose>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
msgid "Don't give verbose output. (This is the default behaviour.)"
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
#, no-wrap
msgid "B<--debug>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:433
+#: ../scripts/uscan.1:439
msgid "Dump the downloaded web pages to stdout for debugging your watch file."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:441
+#: ../scripts/uscan.1:447
#, no-wrap
msgid "B<--user-agent>, B<--useragent>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:444
+#: ../scripts/uscan.1:450
msgid "Override the default user agent header."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:451
+#: ../scripts/uscan.1:457
msgid "Give brief usage information."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
msgid ""
"The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are "
"sourced by a shell in that order to set configuration variables. These may "
@@ -14612,26 +14649,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
#, no-wrap
msgid "B<USCAN_DOWNLOAD>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
msgid ""
"If this is set to I<no>, then newer upstream files will not be downloaded; "
"this is equivalent to the B<--report> or B<--no-download> options."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
#, no-wrap
msgid "B<USCAN_PASV>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
msgid ""
"If this is set to I<yes> or I<no>, this will force FTP connections to use "
"PASV mode or not to, respectively. If this is set to I<default>, then "
@@ -14640,26 +14677,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
#, no-wrap
msgid "B<USCAN_TIMEOUT>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
msgid ""
"If set to a number I<N>, then set the timeout to I<N> seconds. This is "
"equivalent to the B<--timeout> option."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
#, no-wrap
msgid "B<USCAN_SYMLINK>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
msgid ""
"If this is set to I<no>, then a pkg_version.orig.tar.{gz|bz2|lzma|xz} "
"symlink will not be made (equivalent to the B<--no-symlink> option). If it "
@@ -14669,65 +14706,65 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
#, no-wrap
msgid "B<USCAN_DEHS_OUTPUT>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
msgid ""
"If this is set to I<yes>, then DEHS-style output will be used. This is "
"equivalent to the B<--dehs> option."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
#, no-wrap
msgid "B<USCAN_VERBOSE>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
msgid ""
"If this is set to I<yes>, then verbose output will be given. This is "
"equivalent to the B<--verbose> option."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
#, no-wrap
msgid "B<USCAN_USER_AGENT>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
msgid ""
"If set, the specified user agent string will be used in place of the "
"default. This is equivalent to the B<--user-agent> option."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
#, no-wrap
msgid "B<USCAN_DESTDIR>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
msgid ""
"If set, the downloaded files will be placed in this directory. This is "
"equivalent to the B<--destdir> option."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
#, no-wrap
msgid "B<USCAN_REPACK>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:504
+#: ../scripts/uscan.1:510
msgid ""
"If this is set to I<yes>, then after having downloaded a bzip tar, lzma tar, "
"xz tar, or zip archive, B<uscan> will repack it to a gzip tar. This is "
@@ -14735,7 +14772,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:508
+#: ../scripts/uscan.1:514
msgid ""
"The exit status gives some indication of whether a newer version was found "
"or not; one is advised to read the output to determine exactly what happened "
@@ -14743,27 +14780,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:512
+#: ../scripts/uscan.1:518
msgid ""
"Either B<--help> or B<--version> was used, or for some I<watch> file which "
"was examined, a newer upstream version was located."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
msgid ""
"No newer upstream versions were located for any of the I<watch> files "
"examined."
msgstr ""
#. type: SH
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
#, no-wrap
msgid "HISTORY AND UPGRADING"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
msgid ""
"This section briefly describes the backwards-incompatible I<watch> file "
"features which have been added in each I<watch> file version, and the first "
@@ -14771,13 +14808,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
#, no-wrap
msgid "I<Pre-version 2>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
msgid ""
"The I<watch> file syntax was significantly different in those days. Don't "
"use it. If you are upgrading from a pre-version 2 I<watch> file, you are "
@@ -14785,26 +14822,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
#, no-wrap
msgid "I<Version 2>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
msgid ""
"devscripts version 2.6.90: The first incarnation of the current style of "
"I<watch> files."
msgstr ""
#. type: TP
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
#, no-wrap
msgid "I<Version 3>"
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:535
+#: ../scripts/uscan.1:541
msgid ""
"devscripts version 2.8.12: Introduced the following: correct handling of "
"regex special characters in the path part, directory/path pattern matching, "
@@ -14813,7 +14850,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:541
+#: ../scripts/uscan.1:547
msgid ""
"If you are upgrading from version 2, the key incompatibility is if you have "
"multiple groups in the pattern part; whereas only the first one would be "
@@ -14823,12 +14860,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:547
+#: ../scripts/uscan.1:553
msgid "B<dpkg>(1), B<perlre>(1), B<uupdate>(1) and B<devscripts.conf>(5)."
msgstr ""
#. type: Plain text
-#: ../scripts/uscan.1:552
+#: ../scripts/uscan.1:558
msgid ""
"The original version of B<uscan> was written by Christoph Lameter "
"E<lt>clameter at debian.orgE<gt>. Significant improvements, changes and "
@@ -15602,44 +15639,44 @@ msgid "B<-a>, B<--wrap-always>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
msgid ""
"Wrap all package lists in the Debian I<control> file even if the entries are "
-"shorter than 80 characters and could fit in one line line."
+"shorter than 80 characters and could fit in one line."
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
#, no-wrap
msgid "B<-s>, B<--short-indent>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
msgid ""
"Only indent wrapped lines by one space (default is in-line with the field "
"name)."
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
#, no-wrap
msgid "B<-b>, B<--sort-binary-packages>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
msgid "Sort binary package paragraphs by name."
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
#, no-wrap
msgid "B<-k>, B<--keep-first>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
msgid ""
"When sorting binary package paragraphs, leave the first one at the top. "
"Unqualified B<debhelper>(7) configuration files are applied to the first "
@@ -15647,35 +15684,35 @@ msgid ""
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
#, no-wrap
msgid "B<-n>, B<--no-cleanup>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
msgid "Do not remove trailing whitespaces."
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
#, no-wrap
msgid "B<-d >I<path>, B<--debian-directory=>I<path>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
msgid "Location of the I<debian> directory (default: I<./debian>)."
msgstr ""
#. type: TP
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
#, no-wrap
msgid "B<-f >I<file>, B<--file=>I<file>"
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:66
+#: ../doc/wrap-and-sort.1:65
msgid ""
"Wrap and sort only the specified I<file>. You can specify this parameter "
"multiple times. All supported files will be processed if no files are "
@@ -15683,12 +15720,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:69
+#: ../doc/wrap-and-sort.1:68
msgid "Print all files that are touched."
msgstr ""
#. type: Plain text
-#: ../doc/wrap-and-sort.1:73
+#: ../doc/wrap-and-sort.1:72
msgid ""
"B<wrap-and-sort> and this manpage have been written by Benjamin Drung "
"E<lt>bdrung at debian.orgE<gt>."
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index 2361b1b..b6dbdfd 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: devscripts\n"
-"POT-Creation-Date: 2012-10-21 00:40+0300\n"
+"POT-Creation-Date: 2012-12-19 22:36-0500\n"
"PO-Revision-Date: 2012-08-17 11:24-0400\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -220,7 +220,7 @@ msgstr ""
#: ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18
#: ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225
#: ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93
-#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:336
+#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:342
#: ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10
#: ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17
#: ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33
@@ -266,7 +266,7 @@ msgstr "Afficher un message d'aide et quitter avec succès."
#. type: SH
#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30
-#: ../scripts/uscan.1:321
+#: ../scripts/uscan.1:327
#, no-wrap
msgid "EXAMPLE"
msgstr "EXEMPLE"
@@ -339,12 +339,12 @@ msgstr ""
#. type: SH
#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105
-#: ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263
+#: ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:263
#: ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62
#: ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53
#: ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115
#: ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222
-#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:858
+#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:863
#: ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132
#: ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66
#: ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410
@@ -352,10 +352,10 @@ msgstr ""
#: ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118
#: ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73
#: ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19
-#: ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:139
+#: ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:144
#: ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51
#: ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332
-#: ../scripts/tagpending.pl:148 ../scripts/uscan.1:541
+#: ../scripts/tagpending.pl:148 ../scripts/uscan.1:547
#: ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29
#: ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54
#, no-wrap
@@ -386,13 +386,13 @@ msgstr ""
#. type: SH
#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54
-#: ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62
+#: ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:65
#: ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68
#: ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59
#: ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100
#: ../scripts/debc.1:120 ../scripts/debchange.1:476
#: ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111
-#: ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136
+#: ../scripts/debcommit.pl:859 ../scripts/debdiff.1:222 ../scripts/debi.1:136
#: ../scripts/debpkg.1:23 ../scripts/debrelease.1:137
#: ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71
#: ../scripts/debsign.1:146 ../scripts/debuild.1:423
@@ -404,11 +404,11 @@ msgstr ""
#: ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20
#: ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18
#: ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30
-#: ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:143
+#: ../scripts/nmudiff.1:113 ../scripts/origtargz.pl:148
#: ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56
#: ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336
#: ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81
-#: ../scripts/uscan.1:547 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19
+#: ../scripts/uscan.1:553 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19
#: ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31
#: ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58
#, no-wrap
@@ -1239,7 +1239,7 @@ msgstr ""
#: ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24
#: ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89
#: ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69
-#: ../scripts/rmadison.pl:281 ../scripts/uscan.1:444 ../scripts/uupdate.1:78
+#: ../scripts/rmadison.pl:281 ../scripts/uscan.1:450 ../scripts/uupdate.1:78
#: ../scripts/who-uploads.1:40
#, no-wrap
msgid "B<--no-conf>, B<--noconf>"
@@ -1252,7 +1252,7 @@ msgstr "B<--no-conf>, B<--noconf>"
#: ../scripts/debsign.1:100 ../scripts/debuild.1:225
#: ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28
#: ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114
-#: ../scripts/nmudiff.1:73 ../scripts/uscan.1:448 ../scripts/uupdate.1:82
+#: ../scripts/nmudiff.1:73 ../scripts/uscan.1:454 ../scripts/uupdate.1:82
#: ../scripts/who-uploads.1:44
msgid ""
"Do not read any configuration files. This can only be used as the first "
@@ -2811,7 +2811,7 @@ msgstr ""
#. type: SH
#: ../scripts/bts.pl:4002 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92
#: ../scripts/debchange.1:392 ../scripts/debcheckout.pl:177
-#: ../scripts/debclean.1:90 ../scripts/debcommit.pl:97
+#: ../scripts/debclean.1:90 ../scripts/debcommit.pl:99
#: ../scripts/debdiff.1:167 ../scripts/debi.1:109 ../scripts/debrelease.1:105
#: ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290
#: ../scripts/dget.pl:609 ../scripts/dpkg-depcheck.1:102
@@ -2819,14 +2819,14 @@ msgstr ""
#: ../scripts/licensecheck.pl:96 ../scripts/mass-bug.pl:132
#: ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106
#: ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:290
-#: ../scripts/uscan.1:454 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
+#: ../scripts/uscan.1:460 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:50
#, no-wrap
msgid "CONFIGURATION VARIABLES"
msgstr "VARIABLES DE CONFIGURATION"
# NOTE: presque identique
#. type: textblock
-#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:99
+#: ../scripts/bts.pl:4004 ../scripts/debcommit.pl:101
#: ../scripts/licensecheck.pl:98 ../scripts/mass-bug.pl:134
msgid ""
"The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are "
@@ -3249,7 +3249,7 @@ msgstr "Exécuter en mode débogue."
#: ../scripts/debclean.1:84 ../scripts/diff2patches.1:22
#: ../scripts/grep-excuses.1:22 ../scripts/mass-bug.pl:117
#: ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92
-#: ../scripts/uscan.1:448
+#: ../scripts/uscan.1:454
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3268,7 +3268,7 @@ msgstr "Afficher les informations sur l'utilisation."
#: ../scripts/grep-excuses.1:25 ../scripts/mass-bug.pl:121
#: ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95
#: ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:277
-#: ../scripts/uscan.1:451 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
+#: ../scripts/uscan.1:457 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3318,7 +3318,7 @@ msgstr ""
"de cet outil."
#. type: =head1
-#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:847
+#: ../scripts/build-rdeps.pl:337 ../scripts/debcommit.pl:852
#: ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:120
#: ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89
#: ../scripts/transition-check.pl:72
@@ -3394,7 +3394,7 @@ msgstr ""
#. type: Plain text
#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239
-#: ../scripts/mass-bug.pl:123 ../scripts/uscan.1:454
+#: ../scripts/mass-bug.pl:123 ../scripts/uscan.1:460
msgid "Display version information."
msgstr "Afficher les informations sur la version."
@@ -3742,7 +3742,7 @@ msgstr ""
#. type: TP
#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24
-#: ../scripts/transition-check.pl:66 ../scripts/uscan.1:512
+#: ../scripts/transition-check.pl:66 ../scripts/uscan.1:518
#: ../scripts/wnpp-check.1:29
#, no-wrap
msgid "1"
@@ -3768,13 +3768,24 @@ msgstr ""
"Un fichier a été ignoré, par exemple parce qu'il n'était pas lisible ou n'a "
"pas été trouvé. Le message d'erreur donnera des précisions."
+#. type: TP
+#: ../scripts/checkbashisms.1:60
+#, no-wrap
+msgid "4"
+msgstr ""
+
#. type: Plain text
-#: ../scripts/checkbashisms.1:62
+#: ../scripts/checkbashisms.1:63
+msgid "No bashisms were detected in a bash script."
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/checkbashisms.1:65
msgid "B<lintian>(1)."
msgstr "B<lintian>(1)."
#. type: Plain text
-#: ../scripts/checkbashisms.1:65
+#: ../scripts/checkbashisms.1:68
msgid ""
"B<checkbashisms> was originally written as a shell script by Yann Dirson "
"E<lt>I<dirson at debian.org>E<gt> and rewritten in Perl with many more features "
@@ -5832,7 +5843,7 @@ msgstr ""
#. type: SH
#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24
#: ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49
-#: ../scripts/uscan.1:279
+#: ../scripts/uscan.1:285
#, no-wrap
msgid "Directory name checking"
msgstr "Vérification du nom du répertoire"
@@ -5864,14 +5875,14 @@ msgstr ""
#. type: Plain text
#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37
#: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63
-#: ../scripts/uscan.1:296
+#: ../scripts/uscan.1:302
msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:"
msgstr "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> peut prendre les valeurs suivantes :"
#. type: TP
#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37
#: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63
-#: ../scripts/uscan.1:296
+#: ../scripts/uscan.1:302
#, no-wrap
msgid "B<0>"
msgstr "B<0>"
@@ -5879,14 +5890,14 @@ msgstr "B<0>"
#. type: Plain text
#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40
#: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66
-#: ../scripts/uscan.1:299
+#: ../scripts/uscan.1:305
msgid "Never check the directory name."
msgstr "Ne jamais vérifier le nom du répertoire."
#. type: TP
#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40
#: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66
-#: ../scripts/uscan.1:299
+#: ../scripts/uscan.1:305
#, no-wrap
msgid "B<1>"
msgstr "B<1>"
@@ -5904,7 +5915,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44
#: ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70
-#: ../scripts/uscan.1:305
+#: ../scripts/uscan.1:311
#, no-wrap
msgid "B<2>"
msgstr "B<2>"
@@ -5912,7 +5923,7 @@ msgstr "B<2>"
#. type: Plain text
#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47
#: ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73
-#: ../scripts/uscan.1:308
+#: ../scripts/uscan.1:314
msgid "Always check the directory name."
msgstr "Toujours vérifier le nom du répertoire."
@@ -5963,7 +5974,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69
#: ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276
-#: ../scripts/uscan.1:433
+#: ../scripts/uscan.1:439
#, no-wrap
msgid "B<--check-dirname-level> I<N>"
msgstr "B<--check-dirname-level> I<N>"
@@ -5972,8 +5983,8 @@ msgstr "B<--check-dirname-level> I<N>"
#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73
#: ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95
#: ../scripts/debrelease.1:91 ../scripts/debrelease.1:95
-#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:437
-#: ../scripts/uscan.1:441
+#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:443
+#: ../scripts/uscan.1:447
msgid ""
"See the above section B<Directory name checking> for an explanation of this "
"option."
@@ -5984,7 +5995,7 @@ msgstr ""
#. type: TP
#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73
#: ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280
-#: ../scripts/uscan.1:437
+#: ../scripts/uscan.1:443
#, no-wrap
msgid "B<--check-dirname-regex> I<regex>"
msgstr "B<--check-dirname-regex> I<regex>"
@@ -6558,7 +6569,7 @@ msgstr ""
"description de modifications."
#. type: TP
-#: ../scripts/debchange.1:213 ../scripts/uscan.1:396
+#: ../scripts/debchange.1:213 ../scripts/uscan.1:402
#, no-wrap
msgid "B<--package> I<package>"
msgstr "B<--package> I<paquet>"
@@ -8022,14 +8033,10 @@ msgstr "debcommit - Soumettre les changements à un paquet"
#. type: textblock
#: ../scripts/debcommit.pl:9
-msgid ""
-"B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
-"message=>I<text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] [B<--"
-"changelog=>I<path>] [B<--all> | I<files to commit>]"
-msgstr ""
-"B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
-"message=>I<texte>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] [B<--"
-"changelog=>I<chemin>] [B<--all> | I<fichiers à commiter>]"
+#, fuzzy
+#| msgid "B<dscextract> [I<options>] I<dscfile> I<file>"
+msgid "B<debcommit> [I<options>] [B<--all> | I<files to commit>]"
+msgstr "B<dscextract> [I<options>] I<fichier_dsc> I<fichier>"
#. type: textblock
#: ../scripts/debcommit.pl:13
@@ -8196,25 +8203,11 @@ msgstr ""
#. type: =item
#: ../scripts/debcommit.pl:76
-msgid "I<files to commit>"
-msgstr "I<fichiers à commiter>"
-
-#. type: textblock
-#: ../scripts/debcommit.pl:78
-msgid ""
-"Specify which files to commit (debian/changelog is added to the list "
-"automatically.)"
-msgstr ""
-"Indiquer quels fichiers envoyer (debian/changelog est automatiquement ajouté "
-"à la liste)."
-
-#. type: =item
-#: ../scripts/debcommit.pl:81
msgid "B<-s>, B<--strip-message>, B<--no-strip-message>"
msgstr "B<-s>, B<--strip-message>, B<--no-strip-message>"
#. type: textblock
-#: ../scripts/debcommit.pl:83
+#: ../scripts/debcommit.pl:78
msgid ""
"If this option is set and the commit message has been derived from the "
"changelog, the characters \"* \" will be stripped from the beginning of the "
@@ -8226,7 +8219,7 @@ msgstr ""
# NOTE: space inside the brackets?
#. type: textblock
-#: ../scripts/debcommit.pl:87
+#: ../scripts/debcommit.pl:82
msgid ""
"This option is set by default and ignored if more than one line of the "
"message begins with \"[*+-] \"."
@@ -8235,12 +8228,12 @@ msgstr ""
"message commence par « [*+-] » (espace comprise)."
#. type: =item
-#: ../scripts/debcommit.pl:90
+#: ../scripts/debcommit.pl:85
msgid "B<--sign-tags>, B<--no-sign-tags>"
msgstr "B<--sign-tags>, B<--no-sign-tags>"
#. type: textblock
-#: ../scripts/debcommit.pl:92
+#: ../scripts/debcommit.pl:87
msgid ""
"If this option is set, then tags that debcommit creates will be signed using "
"gnupg. Currently this is only supported by git."
@@ -8249,12 +8242,28 @@ msgstr ""
"seront signées avec gnupg. Ce n'est actuellement géré que par git."
#. type: =item
-#: ../scripts/debcommit.pl:107
+#: ../scripts/debcommit.pl:90
+#, fuzzy
+#| msgid "B<--changes>"
+msgid "B<--changelog-info>"
+msgstr "B<--changes>"
+
+#. type: textblock
+#: ../scripts/debcommit.pl:92
+msgid ""
+"If this option is set, the commit author and date will be determined from "
+"the Maintainer and Date field of the first paragraph in debian/changelog. "
+"This is mainly useful when using debchange(1) with the --no-mainttrailer "
+"option."
+msgstr ""
+
+#. type: =item
+#: ../scripts/debcommit.pl:109
msgid "B<DEBCOMMIT_STRIP_MESSAGE>"
msgstr "B<DEBCOMMIT_STRIP_MESSAGE>"
#. type: textblock
-#: ../scripts/debcommit.pl:109
+#: ../scripts/debcommit.pl:111
msgid ""
"If this is set to I<no>, then it is the same as the --no-strip-message "
"command line parameter being used. The default is I<yes>."
@@ -8263,12 +8272,12 @@ msgstr ""
"message>. La valeur par défaut est I<yes>."
#. type: =item
-#: ../scripts/debcommit.pl:112
+#: ../scripts/debcommit.pl:114
msgid "B<DEBCOMMIT_SIGN_TAGS>"
msgstr "B<DEBCOMMIT_SIGN_TAGS>"
#. type: textblock
-#: ../scripts/debcommit.pl:114
+#: ../scripts/debcommit.pl:116
msgid ""
"If this is set to I<yes>, then it is the same as the --sign-tags command "
"line parameter being used. The default is I<no>."
@@ -8277,12 +8286,12 @@ msgstr ""
"La valeur par défaut est I<no>."
#. type: =item
-#: ../scripts/debcommit.pl:117
+#: ../scripts/debcommit.pl:119
msgid "B<DEBCOMMIT_RELEASE_USE_CHANGELOG>"
msgstr "B<DEBCOMMIT_RELEASE_USE_CHANGELOG>"
#. type: textblock
-#: ../scripts/debcommit.pl:119
+#: ../scripts/debcommit.pl:121
msgid ""
"If this is set to I<yes>, then it is the same as the --release-use-changelog "
"command line parameter being used. The default is I<no>."
@@ -8291,13 +8300,13 @@ msgstr ""
"changelog>. La valeur par défaut est I<no>."
#. type: TP
-#: ../scripts/debcommit.pl:122 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:124 ../scripts/debsign.1:118
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr "B<DEBSIGN_KEYID>"
#. type: textblock
-#: ../scripts/debcommit.pl:124
+#: ../scripts/debcommit.pl:126
msgid ""
"This is the key id used for signing tags. If not set, a default will be "
"chosen by the revision control system."
@@ -8307,17 +8316,17 @@ msgstr ""
"de contrôle de versions."
#. type: =head1
-#: ../scripts/debcommit.pl:129
+#: ../scripts/debcommit.pl:131
msgid "VCS SPECIFIC FEATURES"
msgstr "FONCTIONNALITÉS SPÉCIFIQUES AUX SYSTÈMES DE CONTRÔLE DE VERSIONS"
#. type: =item
-#: ../scripts/debcommit.pl:133
+#: ../scripts/debcommit.pl:135
msgid "B<tla> / B<baz>"
msgstr "B<tla> / B<baz>"
#. type: textblock
-#: ../scripts/debcommit.pl:135
+#: ../scripts/debcommit.pl:137
msgid ""
"If the commit message contains more than 72 characters, a summary will be "
"created containing as many full words from the message as will fit within 72 "
@@ -8328,7 +8337,7 @@ msgstr ""
"caractères, suivi de points de suspension."
#. type: textblock
-#: ../scripts/debcommit.pl:141
+#: ../scripts/debcommit.pl:143
msgid ""
"Each of the features described below is applicable only if the commit "
"message has been automatically determined from the changelog."
@@ -8338,12 +8347,12 @@ msgstr ""
"modifications."
#. type: =item
-#: ../scripts/debcommit.pl:146
+#: ../scripts/debcommit.pl:148
msgid "B<git>"
msgstr "B<git>"
#. type: textblock
-#: ../scripts/debcommit.pl:148
+#: ../scripts/debcommit.pl:150
msgid ""
"If only a single change is detected in the changelog, B<debcommit> will "
"unfold it to a single line and behave as if --strip-message was used."
@@ -8353,7 +8362,7 @@ msgstr ""
"comme si l'option --strip-message était utilisée."
#. type: textblock
-#: ../scripts/debcommit.pl:151
+#: ../scripts/debcommit.pl:153
msgid ""
"Otherwise, the first change will be unfolded and stripped to form a summary "
"line and a commit message formed using the summary line followed by a blank "
@@ -8367,12 +8376,12 @@ msgstr ""
"message puisse être retouché avant l'envoi."
#. type: =item
-#: ../scripts/debcommit.pl:156
+#: ../scripts/debcommit.pl:158
msgid "B<hg> / B<darcs>"
msgstr "B<hg> / B<darcs>"
#. type: textblock
-#: ../scripts/debcommit.pl:158
+#: ../scripts/debcommit.pl:160
msgid ""
"The first change detected in the changelog will be unfolded to form a single "
"line summary. If multiple changes were detected then an editor will be "
@@ -8383,12 +8392,12 @@ msgstr ""
"détectées alors un éditeur sera lancé pour permettre de retoucher le message."
#. type: =item
-#: ../scripts/debcommit.pl:162
+#: ../scripts/debcommit.pl:164
msgid "B<bzr>"
msgstr "B<bzr>"
#. type: textblock
-#: ../scripts/debcommit.pl:164
+#: ../scripts/debcommit.pl:166
msgid ""
"If the changelog entry used for the commit message closes any bugs then --"
"fixes options to \"bzr commit\" will be generated to associate the revision "
@@ -8399,7 +8408,7 @@ msgstr ""
"pour associer la révision aux bogues."
#. type: textblock
-#: ../scripts/debcommit.pl:849
+#: ../scripts/debcommit.pl:854
msgid ""
"This code is copyright by Joey Hess <joeyh at debian.org>, all rights "
"reserved. This program comes with ABSOLUTELY NO WARRANTY. You are free to "
@@ -8412,13 +8421,15 @@ msgstr ""
"Public Licence), version 2 ou ultérieure."
#. type: textblock
-#: ../scripts/debcommit.pl:856 ../scripts/mass-bug.pl:522
+#: ../scripts/debcommit.pl:861 ../scripts/mass-bug.pl:522
msgid "Joey Hess <joeyh at debian.org>"
msgstr "Joey Hess <joeyh at debian.org>"
#. type: textblock
-#: ../scripts/debcommit.pl:860
-msgid "svnpath(1)."
+#: ../scripts/debcommit.pl:865
+#, fuzzy
+#| msgid "svnpath(1)."
+msgid "svnpath(1), debchange(1)."
msgstr "svnpath(1)."
#. type: TH
@@ -10521,7 +10532,7 @@ msgstr ""
#. type: TP
#: ../scripts/debsnap.1:42 ../doc/suspicious-source.1:38
-#: ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:66
+#: ../scripts/tagpending.pl:105 ../doc/wrap-and-sort.1:65
#, no-wrap
msgid "B<-v>, B<--verbose>"
msgstr "B<-v>, B<--verbose>"
@@ -10633,7 +10644,7 @@ msgstr ""
#. type: SH
#: ../scripts/debsnap.1:86 ../scripts/dscextract.1:20
-#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:504
+#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:510
#: ../scripts/wnpp-check.1:25
#, no-wrap
msgid "EXIT STATUS"
@@ -10762,7 +10773,7 @@ msgstr "B<devscripts>(1), B<devscripts.conf>(5), B<git-debimport>(1)"
#. type: SH
#: ../scripts/debsnap.1:123 ../doc/edit-patch.1:37
#: ../doc/suspicious-source.1:51 ../doc/what-patch.1:27
-#: ../doc/wrap-and-sort.1:70
+#: ../doc/wrap-and-sort.1:69
#, no-wrap
msgid "AUTHORS"
msgstr "AUTEURS"
@@ -10945,7 +10956,7 @@ msgstr ""
"associées B<--check-dirname-level> et B<--check-dirname-regex>."
#. type: Plain text
-#: ../scripts/debuild.1:86 ../scripts/uscan.1:321
+#: ../scripts/debuild.1:86 ../scripts/uscan.1:327
msgid ""
"The directory name is checked by testing whether the current directory name "
"(as determined by B<pwd>(1)) matches the regex given by the configuration "
@@ -12337,10 +12348,15 @@ msgstr "I<debcommit>(1)"
#. type: Plain text
#: ../scripts/devscripts.1:67
+#, fuzzy
+#| msgid ""
+#| "commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, basing "
+#| "commit message on changelog [cvs | darcs | subversion | svk | tla | bzr | "
+#| "git-core | mercurial]"
msgid ""
"commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, basing commit "
"message on changelog [cvs | darcs | subversion | svk | tla | bzr | git-core "
-"| mercurial]"
+"| mercurial, libtimedate-perl]"
msgstr ""
"soumettre les changements vers CVS, Darcs, Subversion, SVK, GNU Arch, "
"Bazaar, Git ou Mercurial en basant le message de modification sur le journal "
@@ -14042,7 +14058,7 @@ msgstr ""
#. type: TP
#: ../scripts/dscextract.1:21 ../scripts/transition-check.pl:61
-#: ../scripts/uscan.1:508 ../scripts/wnpp-check.1:26
+#: ../scripts/uscan.1:514 ../scripts/wnpp-check.1:26
#, no-wrap
msgid "0"
msgstr "0"
@@ -14155,7 +14171,7 @@ msgstr ""
#. type: TP
#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78
-#: ../scripts/uscan.1:424
+#: ../scripts/uscan.1:430
#, no-wrap
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -15794,30 +15810,39 @@ msgstr "B<-u>, B<--unpack>[=B<no>|B<once>|B<yes>]"
#. type: textblock
#: ../scripts/origtargz.pl:94
+#, fuzzy
+#| msgid ""
+#| "Always unpack the orig tarball. Existing files are removed, except for "
+#| "F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-"
+#| "builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
msgid ""
"Unpack the downloaded orig tarball to the current directory, replacing "
-"everything except the debian directory. Valid choices are:"
+"everything except the debian directory. Existing files are removed, except "
+"for F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-"
+"builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
msgstr ""
-"Dépaqueter l'archive amont téléchargée dans le répertoire actuel, en "
-"remplaçant tout sauf le répertoire I<debian>. Les choix possibles sont :"
+"Toujours dépaqueter l'archive amont. Les fichiers existants sont retirés, "
+"sauf le répertoire F<debian> et les fichiers du système de contrôle de "
+"versions. Sont gardés : F<.bzr>, F<.bzrignore>, F<.bzr-builddeb>, F<.git>, "
+"F<.gitignore>, F<.hg>, F<.hgignore> et F<.svn>."
#. type: =item
-#: ../scripts/origtargz.pl:99
+#: ../scripts/origtargz.pl:101
msgid "B<no>"
msgstr "B<no>"
#. type: textblock
-#: ../scripts/origtargz.pl:101
+#: ../scripts/origtargz.pl:103
msgid "Do not unpack the orig tarball."
msgstr "Ne pas dépaqueter l'archive amont."
#. type: =item
-#: ../scripts/origtargz.pl:103
+#: ../scripts/origtargz.pl:105
msgid "B<once> (default when B<--unpack> is not used)"
msgstr "B<once> (par défaut si B<--unpack> n'est pas utilisé)"
#. type: textblock
-#: ../scripts/origtargz.pl:105
+#: ../scripts/origtargz.pl:107
msgid ""
"If the current directory contains only a F<debian> directory (and possibly "
"some dotfiles), unpack the orig tarball. This is the default behavior."
@@ -15827,21 +15852,16 @@ msgstr ""
"le comportement par défaut."
#. type: =item
-#: ../scripts/origtargz.pl:108
+#: ../scripts/origtargz.pl:110
msgid "B<yes> (default for B<--unpack> without argument)"
msgstr "B<yes> (par défaut si B<--unpack> est utilisé sans argument)"
#. type: textblock
-#: ../scripts/origtargz.pl:110
-msgid ""
-"Always unpack the orig tarball. Existing files are removed, except for "
-"F<debian/> and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-"
-"builddeb>, F<.git>, F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>."
-msgstr ""
-"Toujours dépaqueter l'archive amont. Les fichiers existants sont retirés, "
-"sauf le répertoire F<debian> et les fichiers du système de contrôle de "
-"versions. Sont gardés : F<.bzr>, F<.bzrignore>, F<.bzr-builddeb>, F<.git>, "
-"F<.gitignore>, F<.hg>, F<.hgignore> et F<.svn>."
+#: ../scripts/origtargz.pl:112
+#, fuzzy
+#| msgid "Do not unpack the orig tarball."
+msgid "Always unpack the orig tarball."
+msgstr "Ne pas dépaqueter l'archive amont."
#. type: textblock
#: ../scripts/origtargz.pl:118
@@ -15867,15 +15887,29 @@ msgstr ""
"utilisé pour comparer le dernier envoi au prochain. Avec B<--tar-only>, seul "
"le fichier F<.orig.tar.*> est téléchargé."
+#. type: =item
+#: ../scripts/origtargz.pl:127
+#, fuzzy
+#| msgid "B<--cleandebs>"
+msgid "B<--clean>"
+msgstr "B<--cleandebs>"
+
#. type: textblock
-#: ../scripts/origtargz.pl:141
+#: ../scripts/origtargz.pl:129
+msgid ""
+"Remove existing files as with B<--unpack>. Note that like B<--unpack>, this "
+"will remove upstream files even if they are stored in VCS."
+msgstr ""
+
+#. type: textblock
+#: ../scripts/origtargz.pl:146
msgid ""
"B<debcheckout>(1), B<git-import-orig>(1), B<svn-upgrade>(1), B<uupdate>(1)"
msgstr ""
"B<debcheckout>(1), B<git-import-orig>(1), B<svn-upgrade>(1), B<uupdate>(1)"
#. type: textblock
-#: ../scripts/origtargz.pl:145
+#: ../scripts/origtargz.pl:150
msgid ""
"B<origtargz> and this manpage have been written by Christoph Berg "
"<I<myon at debian.org>>."
@@ -17144,7 +17178,7 @@ msgstr ""
"Drung E<lt>I<bdrung at debian.org>E<gt>."
#. type: Plain text
-#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:74
+#: ../doc/suspicious-source.1:55 ../doc/wrap-and-sort.1:73
msgid "Both are released under the ISC license."
msgstr "Toutes deux sont publiées sous la License ISC."
@@ -17747,7 +17781,15 @@ msgstr ""
"http://tmrc.mit.edu/mirror/twisted/Twisted/(\\ed\\e.\\ed)/Twisted-([\\ed\\e.]*)\\e.tar\\e.bz2\n"
#. type: Plain text
-#: ../scripts/uscan.1:75
+#: ../scripts/uscan.1:73
+#, no-wrap
+msgid ""
+"# For maximum flexibility with upstream tarball formats, use this:\n"
+"http://example.com/example-(\\d[\\d.]*)\\e.(?:zip|tgz|tbz2|txz|tar\\e.(?:gz|bz2|xz))\n"
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/uscan.1:78
#, no-wrap
msgid ""
"# qa.debian.org runs a redirector which allows a simpler form of URL\n"
@@ -17761,19 +17803,31 @@ msgstr ""
"http://sf.net/audacity/audacity-src-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:79
-#, no-wrap
+#: ../scripts/uscan.1:81
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# githubredir.debian.net is a redirector for GitHub projects\n"
+#| "# It can be used as following:\n"
+#| "http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
msgid ""
-"# githubredir.debian.net is a redirector for GitHub projects\n"
-"# It can be used as following:\n"
-"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
+"# For GitHub projects you can use the tags page:\n"
+"https://github.com/E<lt>userE<gt>/E<lt>projectE<gt>/tags .*/(\\ed[\\ed\\e.]*)\\e.tar\\e.gz\n"
msgstr ""
"# githubredir.debian.net est un redirecteur pour les projets GitHub\n"
"# Il peut être utilisé de la façon suivante :\n"
"http://githubredir.debian.net/github/E<lt>utilisateurE<gt>/E<lt>projetE<gt> (.+).tar.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:84
+#: ../scripts/uscan.1:85
+#, no-wrap
+msgid ""
+"# For Google Code projects you should use the downloads page like this:\n"
+"http://code.google.com/p/E<lt>projectE<gt>/downloads/list?can=1 \\e\n"
+" .*/E<lt>projectE<gt>-(\\ed[\\ed.]*)\\e.tar\\e.gz\n"
+msgstr ""
+
+#. type: Plain text
+#: ../scripts/uscan.1:90
#, no-wrap
msgid ""
"# This is the format for a site which has funny version numbers;\n"
@@ -17788,7 +17842,7 @@ msgstr ""
# NOTE: Ca reste encore cryptique
#. type: Plain text
-#: ../scripts/uscan.1:92
+#: ../scripts/uscan.1:98
#, no-wrap
msgid ""
"# This is another way of handling site with funny version numbers,\n"
@@ -17808,7 +17862,7 @@ msgstr ""
" ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:97
+#: ../scripts/uscan.1:103
#, no-wrap
msgid ""
"# Similarly, the upstream part of the Debian version number can be\n"
@@ -17822,7 +17876,7 @@ msgstr ""
" http://un.site.org/un/chemin/toto-(.+)\\e.tar\\e.gz\n"
#. type: Plain text
-#: ../scripts/uscan.1:110
+#: ../scripts/uscan.1:116
#, no-wrap
msgid ""
"# The filename is found by taking the last component of the URL and\n"
@@ -17853,7 +17907,7 @@ msgstr ""
"# http://toto.titi.org/download/\\e?path=&download_version=(.+)\n"
#. type: Plain text
-#: ../scripts/uscan.1:118
+#: ../scripts/uscan.1:124
#, no-wrap
msgid ""
"# The option downloadurlmangle can be used to mangle the URL of the file\n"
@@ -17874,7 +17928,7 @@ msgstr ""
"# http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n"
#. type: Plain text
-#: ../scripts/uscan.1:124
+#: ../scripts/uscan.1:130
msgid ""
"Comment lines may be introduced with a `B<#>' character. Continuation lines "
"may be indicated by terminating a line with a backslash character."
@@ -17884,7 +17938,7 @@ msgstr ""
"caractère backslash (« B<\\e> »)."
#. type: Plain text
-#: ../scripts/uscan.1:128
+#: ../scripts/uscan.1:134
msgid ""
"The first (non-comment) line of the file must begin `version=3'. This "
"allows for future extensions without having to change the name of the file."
@@ -17894,7 +17948,7 @@ msgstr ""
"sans avoir à changer le nom du fichier."
#. type: Plain text
-#: ../scripts/uscan.1:133
+#: ../scripts/uscan.1:139
msgid ""
"There are two possibilities for the syntax of an HTTP I<watch> file line, "
"and only one for an FTP line. We begin with the common (and simpler) "
@@ -17907,7 +17961,7 @@ msgstr ""
"ignoré dans ce qui suit."
#. type: Plain text
-#: ../scripts/uscan.1:150
+#: ../scripts/uscan.1:156
msgid ""
"The first field gives the full pattern of URLs being searched for. In the "
"case of an FTP site, the directory listing for the requested directory will "
@@ -17945,7 +17999,7 @@ msgstr ""
# NOTE: ancré: ^...$
#. type: Plain text
-#: ../scripts/uscan.1:159
+#: ../scripts/uscan.1:165
msgid ""
"The pattern (after the final slash) is a Perl regexp (see B<perlre>(1) for "
"details of these). You need to make the pattern so tight that it matches "
@@ -17965,7 +18019,7 @@ msgstr ""
"groupe Perl comme décrit dans le prochain paragraphe."
#. type: Plain text
-#: ../scripts/uscan.1:170
+#: ../scripts/uscan.1:176
msgid ""
"Having got a list of `files' matching the pattern, their version numbers are "
"extracted by treating the part matching the Perl regexp groups, demarcated "
@@ -17990,7 +18044,7 @@ msgstr ""
"B<uversionmangle> pour nettoyer la version par la suite."
#. type: Plain text
-#: ../scripts/uscan.1:187
+#: ../scripts/uscan.1:193
msgid ""
"The current (upstream) version can be specified as the second parameter in "
"the I<watch> file line. If this is I<debian> or absent, then the current "
@@ -18025,7 +18079,7 @@ msgstr ""
"symlink>."
#. type: Plain text
-#: ../scripts/uscan.1:190
+#: ../scripts/uscan.1:196
msgid ""
"Finally, if a third parameter (an action) is given in the I<watch> file "
"line, this is taken as the name of a command, and the command"
@@ -18034,13 +18088,13 @@ msgstr ""
"I<watch>, il est considéré comme le nom d'une commande, et la commande :"
#. type: Plain text
-#: ../scripts/uscan.1:192
+#: ../scripts/uscan.1:198
#, no-wrap
msgid " I<command >B<--upstream-version>I< version filename>\n"
msgstr " I<commande> B<--upstream-version> I<version nom_fichier>\n"
#. type: Plain text
-#: ../scripts/uscan.1:201
+#: ../scripts/uscan.1:207
msgid ""
"is executed, using either the original file or the symlink name. A common "
"such command would be B<uupdate>(1). (Note that the calling syntax was "
@@ -18057,7 +18111,7 @@ msgstr ""
"« I<commande fichier version> ».)"
#. type: Plain text
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
msgid ""
"The alternative version of the I<watch> file syntax for HTTP URLs is as "
"follows. The first field is a homepage which should be downloaded and then "
@@ -18091,13 +18145,13 @@ msgstr ""
"version et de la commande, comme précédemment."
#. type: SH
-#: ../scripts/uscan.1:217
+#: ../scripts/uscan.1:223
#, no-wrap
msgid "PER-SITE OPTIONS"
msgstr "OPTIONS SPÉCIFIQUES À UN SITE"
#. type: Plain text
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
msgid ""
"A I<watch> file line may be prefixed with `B<opts=>I<options>', where "
"I<options> is a comma-separated list of options. The whole I<options> "
@@ -18110,13 +18164,13 @@ msgstr ""
"nécessaire si I<options> contient des espaces. Les options reconnues sont :"
#. type: TP
-#: ../scripts/uscan.1:223
+#: ../scripts/uscan.1:229
#, no-wrap
msgid "B<active> and B<passive> (or B<pasv>)"
msgstr "B<active> et B<passive> (ou B<pasv>)"
#. type: Plain text
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
msgid ""
"If used on an FTP line, these override the choice of whether to use PASV "
"mode or not, and force the use of the specified mode for this site."
@@ -18125,13 +18179,13 @@ msgstr ""
"(PASV) ou actif pour ce site."
#. type: TP
-#: ../scripts/uscan.1:228
+#: ../scripts/uscan.1:234
#, no-wrap
msgid "B<uversionmangle=>I<rules>"
msgstr "B<uversionmangle=>I<règles>"
#. type: Plain text
-#: ../scripts/uscan.1:235
+#: ../scripts/uscan.1:241
msgid ""
"This is used to mangle the upstream version number as matched by the "
"ftp://... or http:// rules as follows. First, the I<rules> string is split "
@@ -18147,13 +18201,13 @@ msgstr ""
"suivante :"
#. type: Plain text
-#: ../scripts/uscan.1:237
+#: ../scripts/uscan.1:243
#, no-wrap
msgid " $version =~ I<rule>;\n"
msgstr " $version =~ I<règle>;\n"
#. type: Plain text
-#: ../scripts/uscan.1:242
+#: ../scripts/uscan.1:248
msgid ""
"for each rule. Thus, suitable rules might be `B<s/^/0./>' to prepend `B<0."
">' to the version number and `B<s/_/./g>' to change underscores into "
@@ -18166,7 +18220,7 @@ msgstr ""
"de virgule ; cela ne devrait pas être un problème."
#. type: Plain text
-#: ../scripts/uscan.1:247
+#: ../scripts/uscan.1:253
msgid ""
"I<rule> may only use the 'B<s>', 'B<tr>' and 'B<y>' operations. When the "
"'B<s>' operation is used, only the 'B<g>', 'B<i>' and 'B<x>' flags are "
@@ -18181,7 +18235,7 @@ msgstr ""
"constructions de la forme (?{}) ou (??{}) ne sont pas prises en charge)."
#. type: Plain text
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
msgid ""
"If the 'B<s>' operation is used, the replacement can contain backreferences "
"to expressions within parenthesis in the matching regexp, like `B<s/-alpha"
@@ -18195,13 +18249,13 @@ msgstr ""
"syntaxe « B<\\e1> » n'est pas permise."
#. type: TP
-#: ../scripts/uscan.1:252
+#: ../scripts/uscan.1:258
#, no-wrap
msgid "B<dversionmangle=>I<rules>"
msgstr "B<dversionmangle=>I<règles>"
#. type: Plain text
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
msgid ""
"This is used to mangle the Debian version number of the currently installed "
"package in the same way as the B<uversionmangle> option. Thus, a suitable "
@@ -18218,13 +18272,13 @@ msgstr ""
"ne doit pas contenir de virgule ; cela ne devrait pas être un problème."
#. type: TP
-#: ../scripts/uscan.1:260
+#: ../scripts/uscan.1:266
#, no-wrap
msgid "B<versionmangle=>I<rules>"
msgstr "B<versionmangle=>I<règles>"
#. type: Plain text
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
msgid ""
"This is a syntactic shorthand for B<uversionmangle=>I<rules>B<,"
"dversionmangle=>I<rules>, applying the same rules to both the upstream and "
@@ -18235,13 +18289,13 @@ msgstr ""
"numéros de version Debian et amont."
#. type: TP
-#: ../scripts/uscan.1:265
+#: ../scripts/uscan.1:271
#, no-wrap
msgid "B<filenamemangle=>I<rules>"
msgstr "B<filenamemangle=>I<règles>"
#. type: Plain text
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
msgid ""
"This is used to mangle the filename with which the downloaded file will be "
"saved, and is parsed in the same way as the B<uversionmangle> option. "
@@ -18253,13 +18307,13 @@ msgstr ""
"section ci-dessus."
#. type: TP
-#: ../scripts/uscan.1:271
+#: ../scripts/uscan.1:277
#, no-wrap
msgid "B<downloadurlmangle=>I<rules>"
msgstr "B<downloadurlmangle=>I<règles>"
#. type: Plain text
-#: ../scripts/uscan.1:279
+#: ../scripts/uscan.1:285
msgid ""
"This is used to mangle the URL to be used for the download. The URL is "
"first computed based on the homepage downloaded and the pattern matched, "
@@ -18276,7 +18330,7 @@ msgstr ""
# NOTE: "and in order to promote efficiency" ?
#. type: Plain text
-#: ../scripts/uscan.1:294
+#: ../scripts/uscan.1:300
msgid ""
"Similarly to several other scripts in the B<devscripts> package, B<uscan> "
"explores the requested directory trees looking for I<debian/changelog> and "
@@ -18305,7 +18359,7 @@ msgstr ""
"check-dirname-regex>."
#. type: Plain text
-#: ../scripts/uscan.1:305
+#: ../scripts/uscan.1:311
msgid ""
"Only check the directory name if we have had to change directory in our "
"search for I<debian/changelog>, that is, the directory containing I<debian/"
@@ -18318,13 +18372,13 @@ msgstr ""
"été invoqué. C'est le comportement par défaut."
#. type: Plain text
-#: ../scripts/uscan.1:323
+#: ../scripts/uscan.1:329
msgid "This script will perform a fully automatic upstream update."
msgstr ""
"Ce script va réaliser une mise à jour complètement automatique avec l'amont."
#. type: Plain text
-#: ../scripts/uscan.1:331
+#: ../scripts/uscan.1:337
#, no-wrap
msgid ""
"#!/bin/sh -e\n"
@@ -18342,7 +18396,7 @@ msgstr ""
"debuild\n"
#. type: Plain text
-#: ../scripts/uscan.1:336
+#: ../scripts/uscan.1:342
msgid ""
"Note that we don't call B<dupload> or B<dput> automatically, as the "
"maintainer should perform sanity checks on the software before uploading it "
@@ -18353,13 +18407,13 @@ msgstr ""
"de l'envoyer à l'archive Debian."
#. type: TP
-#: ../scripts/uscan.1:337
+#: ../scripts/uscan.1:343
#, no-wrap
msgid "B<--report>, B<--no-download>"
msgstr "B<--report>, B<--no-download>"
#. type: Plain text
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
msgid ""
"Only report about available newer versions but do not download anything."
msgstr ""
@@ -18367,13 +18421,13 @@ msgstr ""
"télécharger."
#. type: TP
-#: ../scripts/uscan.1:340
+#: ../scripts/uscan.1:346
#, no-wrap
msgid "B<--report-status>"
msgstr "B<--report-status>"
#. type: Plain text
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
msgid ""
"Report on the status of all packages, even those which are up-to-date, but "
"do not download anything."
@@ -18382,25 +18436,25 @@ msgstr ""
"rien télécharger du tout."
#. type: TP
-#: ../scripts/uscan.1:344
+#: ../scripts/uscan.1:350
#, no-wrap
msgid "B<--download>"
msgstr "B<--download>"
#. type: Plain text
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
msgid "Report and download. (This is the default behaviour.)"
msgstr ""
"Fournir un rapport puis télécharger (c'est le comportement par défaut)."
#. type: TP
-#: ../scripts/uscan.1:347
+#: ../scripts/uscan.1:353
#, no-wrap
msgid "B<--destdir>"
msgstr "B<--destdir>"
#. type: Plain text
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
msgid ""
"Path of directory to which to download. If the specified path is not "
"absolute, it will be relative to one of the current directory or, if "
@@ -18411,13 +18465,13 @@ msgstr ""
"l'exploration de répertoires est activée, au répertoire du paquet source."
#. type: TP
-#: ../scripts/uscan.1:352
+#: ../scripts/uscan.1:358
#, no-wrap
msgid "B<--force-download>"
msgstr "B<--force-download>"
#. type: Plain text
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
msgid ""
"Download upstream even if up to date (will not overwrite local files, "
"however)"
@@ -18426,46 +18480,46 @@ msgstr ""
"fichiers locaux ne sont pas écrasés)."
#. type: TP
-#: ../scripts/uscan.1:355
+#: ../scripts/uscan.1:361
#, no-wrap
msgid "B<--pasv>"
msgstr "B<--pasv>"
#. type: Plain text
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
msgid "Force PASV mode for FTP connections."
msgstr "Forcer le mode passif (« PASV ») pour les connexions FTP."
#. type: TP
-#: ../scripts/uscan.1:358
+#: ../scripts/uscan.1:364
#, no-wrap
msgid "B<--no-pasv>"
msgstr "B<--no-pasv>"
#. type: Plain text
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
msgid "Do not use PASV mode for FTP connections."
msgstr "Ne pas utiliser le mode passif pour les connexions FTP."
#. type: TP
-#: ../scripts/uscan.1:361
+#: ../scripts/uscan.1:367
#, no-wrap
msgid "B<--timeout> I<N>"
msgstr "B<--timeout> I<N>"
#. type: Plain text
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
msgid "Set timeout to N seconds (default 20 seconds)."
msgstr "Définir le temps d'attente à N secondes (20 secondes par défaut)."
#. type: TP
-#: ../scripts/uscan.1:364
+#: ../scripts/uscan.1:370
#, no-wrap
msgid "B<--symlink>"
msgstr "B<--symlink>"
#. type: Plain text
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
msgid ""
"Make orig.tar.gz symlinks to any downloaded files if their extensions are I<."
"tar.gz> or I<.tgz>. This is also handled for orig.tar.bz2 (for upstream I<."
@@ -18481,13 +18535,13 @@ msgstr ""
"C'est le comportement par défaut."
#. type: TP
-#: ../scripts/uscan.1:372
+#: ../scripts/uscan.1:378
#, no-wrap
msgid "B<--rename>"
msgstr "B<--rename>"
#. type: Plain text
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
msgid ""
"Instead of symlinking, rename the downloaded files to their Debian I<orig."
"tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma>, or I<orig.tar.xz> names as "
@@ -18498,13 +18552,13 @@ msgstr ""
"I<orig.tar.xz> conformément à la description ci-dessus."
#. type: TP
-#: ../scripts/uscan.1:377
+#: ../scripts/uscan.1:383
#, no-wrap
msgid "B<--repack>"
msgstr "B<--repack>"
#. type: Plain text
-#: ../scripts/uscan.1:387
+#: ../scripts/uscan.1:393
msgid ""
"After having downloaded an lzma tar, xz tar, bzip tar or zip archive, repack "
"it to a gzip tar archive, which is still currently required as a member of a "
@@ -18526,35 +18580,35 @@ msgstr ""
"archives tar compressées avec lzma ou xz."
#. type: TP
-#: ../scripts/uscan.1:387 ../scripts/uupdate.1:74
+#: ../scripts/uscan.1:393 ../scripts/uupdate.1:74
#, no-wrap
msgid "B<--no-symlink>"
msgstr "B<--no-symlink>"
#. type: Plain text
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
msgid "Don't make these symlinks and don't rename the files."
msgstr "Ne pas créer ces liens symboliques et ne pas renommer les fichiers."
#. type: TP
-#: ../scripts/uscan.1:390
+#: ../scripts/uscan.1:396
#, no-wrap
msgid "B<--dehs>"
msgstr "B<--dehs>"
#. type: Plain text
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
msgid "Use an XML format for output, as required by the DEHS system."
msgstr "Utiliser le format XML pour la sortie, requis par le système DEHS."
#. type: TP
-#: ../scripts/uscan.1:393
+#: ../scripts/uscan.1:399
#, no-wrap
msgid "B<--no-dehs>"
msgstr "B<--no-dehs>"
#. type: Plain text
-#: ../scripts/uscan.1:396
+#: ../scripts/uscan.1:402
msgid ""
"Use the traditional uscan output format. (This is the default behaviour.)"
msgstr ""
@@ -18562,7 +18616,7 @@ msgstr ""
"par défaut)."
#. type: Plain text
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
msgid ""
"Specify the name of the package to check for rather than examining I<debian/"
"changelog>; this requires the B<--upstream-version> (unless a version is "
@@ -18579,13 +18633,13 @@ msgstr ""
"(et B<--dehs>)."
#. type: TP
-#: ../scripts/uscan.1:405
+#: ../scripts/uscan.1:411
#, no-wrap
msgid "B<--upstream-version> I<upstream-version>"
msgstr "B<--upstream-version> I<version-amont>"
#. type: Plain text
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
msgid ""
"Specify the current upstream version rather than examine the I<watch> file "
"or I<changelog> to determine it. This is ignored if a directory scan is "
@@ -18596,13 +18650,13 @@ msgstr ""
"balayage de répertoire est fait et que plus d'un fichier I<watch> est trouvé."
#. type: TP
-#: ../scripts/uscan.1:410
+#: ../scripts/uscan.1:416
#, no-wrap
msgid "B<--watchfile> I<watchfile>"
msgstr "B<--watchfile> I<watchfile>"
#. type: Plain text
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
msgid ""
"Specify the I<watchfile> rather than perform a directory scan to determine "
"it. If this option is used without B<--package>, then B<uscan> must be "
@@ -18616,13 +18670,13 @@ msgstr ""
"l'arborescence)."
#. type: TP
-#: ../scripts/uscan.1:417
+#: ../scripts/uscan.1:423
#, no-wrap
msgid "B<--download-version> I<version>"
msgstr "B<--download-version> I<version>"
#. type: Plain text
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
msgid ""
"Specify the version which the upstream release must match in order to be "
"considered, rather than using the release with the highest version."
@@ -18631,64 +18685,64 @@ msgstr ""
"de version le plus important."
#. type: TP
-#: ../scripts/uscan.1:421
+#: ../scripts/uscan.1:427
#, no-wrap
msgid "B<--download-current-version>"
msgstr "B<--download-current-version>"
#. type: Plain text
-#: ../scripts/uscan.1:424
+#: ../scripts/uscan.1:430
msgid "Download the currently packaged version"
msgstr "Télécharger la version du paquet actuel"
#. type: Plain text
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
msgid "Give verbose output."
msgstr "Donner une sortie bavarde."
#. type: TP
-#: ../scripts/uscan.1:427
+#: ../scripts/uscan.1:433
#, no-wrap
msgid "B<--no-verbose>"
msgstr "B<--no-verbose>"
#. type: Plain text
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
msgid "Don't give verbose output. (This is the default behaviour.)"
msgstr "Ne pas donner de sortie bavarde (c'est le comportement par défaut)."
#. type: TP
-#: ../scripts/uscan.1:430
+#: ../scripts/uscan.1:436
#, no-wrap
msgid "B<--debug>"
msgstr "B<--debug>"
#. type: Plain text
-#: ../scripts/uscan.1:433
+#: ../scripts/uscan.1:439
msgid "Dump the downloaded web pages to stdout for debugging your watch file."
msgstr ""
"Afficher les pages web téléchargées sur la sortie standard afin de déboguer "
"le fichier « watch »."
#. type: TP
-#: ../scripts/uscan.1:441
+#: ../scripts/uscan.1:447
#, no-wrap
msgid "B<--user-agent>, B<--useragent>"
msgstr "B<--user-agent>, B<--useragent>"
#. type: Plain text
-#: ../scripts/uscan.1:444
+#: ../scripts/uscan.1:450
msgid "Override the default user agent header."
msgstr "Utiliser un champ « user agent » différent de celui par défaut."
#. type: Plain text
-#: ../scripts/uscan.1:451
+#: ../scripts/uscan.1:457
msgid "Give brief usage information."
msgstr "Afficher un bref message d'aide."
# NOTE: presque identique à un autre ?
#. type: Plain text
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
msgid ""
"The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are "
"sourced by a shell in that order to set configuration variables. These may "
@@ -18707,13 +18761,13 @@ msgstr ""
"actuellement identifiées sont :"
#. type: TP
-#: ../scripts/uscan.1:461
+#: ../scripts/uscan.1:467
#, no-wrap
msgid "B<USCAN_DOWNLOAD>"
msgstr "B<USCAN_DOWNLOAD>"
#. type: Plain text
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
msgid ""
"If this is set to I<no>, then newer upstream files will not be downloaded; "
"this is equivalent to the B<--report> or B<--no-download> options."
@@ -18723,13 +18777,13 @@ msgstr ""
"download>."
#. type: TP
-#: ../scripts/uscan.1:466
+#: ../scripts/uscan.1:472
#, no-wrap
msgid "B<USCAN_PASV>"
msgstr "B<USCAN_PASV>"
#. type: Plain text
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
msgid ""
"If this is set to I<yes> or I<no>, this will force FTP connections to use "
"PASV mode or not to, respectively. If this is set to I<default>, then "
@@ -18742,13 +18796,13 @@ msgstr ""
"principalement sur la variable d'environnement B<FTP_PASSIVE>)."
#. type: TP
-#: ../scripts/uscan.1:472
+#: ../scripts/uscan.1:478
#, no-wrap
msgid "B<USCAN_TIMEOUT>"
msgstr "B<USCAN_TIMEOUT>"
#. type: Plain text
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
msgid ""
"If set to a number I<N>, then set the timeout to I<N> seconds. This is "
"equivalent to the B<--timeout> option."
@@ -18757,13 +18811,13 @@ msgstr ""
"à I<N> secondes. C'est équivalent à l'option B<--timeout>."
#. type: TP
-#: ../scripts/uscan.1:476
+#: ../scripts/uscan.1:482
#, no-wrap
msgid "B<USCAN_SYMLINK>"
msgstr "B<USCAN_SYMLINK>"
#. type: Plain text
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
msgid ""
"If this is set to I<no>, then a pkg_version.orig.tar.{gz|bz2|lzma|xz} "
"symlink will not be made (equivalent to the B<--no-symlink> option). If it "
@@ -18778,13 +18832,13 @@ msgstr ""
"l'option B<--rename>)."
#. type: TP
-#: ../scripts/uscan.1:483
+#: ../scripts/uscan.1:489
#, no-wrap
msgid "B<USCAN_DEHS_OUTPUT>"
msgstr "B<USCAN_DEHS_OUTPUT>"
#. type: Plain text
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
msgid ""
"If this is set to I<yes>, then DEHS-style output will be used. This is "
"equivalent to the B<--dehs> option."
@@ -18793,13 +18847,13 @@ msgstr ""
"l'option B<--dehs> était utilisée."
#. type: TP
-#: ../scripts/uscan.1:487
+#: ../scripts/uscan.1:493
#, no-wrap
msgid "B<USCAN_VERBOSE>"
msgstr "B<USCAN_VERBOSE>"
#. type: Plain text
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
msgid ""
"If this is set to I<yes>, then verbose output will be given. This is "
"equivalent to the B<--verbose> option."
@@ -18808,13 +18862,13 @@ msgstr ""
"l'option B<--verbose> était utilisée."
#. type: TP
-#: ../scripts/uscan.1:491
+#: ../scripts/uscan.1:497
#, no-wrap
msgid "B<USCAN_USER_AGENT>"
msgstr "B<USCAN_USER_AGENT>"
#. type: Plain text
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
msgid ""
"If set, the specified user agent string will be used in place of the "
"default. This is equivalent to the B<--user-agent> option."
@@ -18824,13 +18878,13 @@ msgstr ""
"équivalent à l'option B<--user-agent>."
#. type: TP
-#: ../scripts/uscan.1:495
+#: ../scripts/uscan.1:501
#, no-wrap
msgid "B<USCAN_DESTDIR>"
msgstr "B<USCAN_DESTDIR>"
#. type: Plain text
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
msgid ""
"If set, the downloaded files will be placed in this directory. This is "
"equivalent to the B<--destdir> option."
@@ -18839,13 +18893,13 @@ msgstr ""
"seront placés. C'est équivalent à l'option B<--destdir>."
#. type: TP
-#: ../scripts/uscan.1:499
+#: ../scripts/uscan.1:505
#, no-wrap
msgid "B<USCAN_REPACK>"
msgstr "B<USCAN_REPACK>"
#. type: Plain text
-#: ../scripts/uscan.1:504
+#: ../scripts/uscan.1:510
msgid ""
"If this is set to I<yes>, then after having downloaded a bzip tar, lzma tar, "
"xz tar, or zip archive, B<uscan> will repack it to a gzip tar. This is "
@@ -18856,7 +18910,7 @@ msgstr ""
"archive tar compressée avec gzip. C'est équivalent à l'option B<--repack>."
#. type: Plain text
-#: ../scripts/uscan.1:508
+#: ../scripts/uscan.1:514
msgid ""
"The exit status gives some indication of whether a newer version was found "
"or not; one is advised to read the output to determine exactly what happened "
@@ -18867,7 +18921,7 @@ msgstr ""
"et pour voir s'il n'y a pas eu d'avertissement."
#. type: Plain text
-#: ../scripts/uscan.1:512
+#: ../scripts/uscan.1:518
msgid ""
"Either B<--help> or B<--version> was used, or for some I<watch> file which "
"was examined, a newer upstream version was located."
@@ -18876,7 +18930,7 @@ msgstr ""
"nouvelle version amont a été trouvée pour un des fichiers I<watch> examinés."
#. type: Plain text
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
msgid ""
"No newer upstream versions were located for any of the I<watch> files "
"examined."
@@ -18885,13 +18939,13 @@ msgstr ""
"examinés."
#. type: SH
-#: ../scripts/uscan.1:516
+#: ../scripts/uscan.1:522
#, no-wrap
msgid "HISTORY AND UPGRADING"
msgstr "HISTORIQUE ET MISE À NIVEAU"
#. type: Plain text
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
msgid ""
"This section briefly describes the backwards-incompatible I<watch> file "
"features which have been added in each I<watch> file version, and the first "
@@ -18903,13 +18957,13 @@ msgstr ""
"comprenait."
#. type: TP
-#: ../scripts/uscan.1:520
+#: ../scripts/uscan.1:526
#, no-wrap
msgid "I<Pre-version 2>"
msgstr "I<Versions antérieures à 2>"
#. type: Plain text
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
msgid ""
"The I<watch> file syntax was significantly different in those days. Don't "
"use it. If you are upgrading from a pre-version 2 I<watch> file, you are "
@@ -18921,13 +18975,13 @@ msgstr ""
"recommencer à zéro."
#. type: TP
-#: ../scripts/uscan.1:525
+#: ../scripts/uscan.1:531
#, no-wrap
msgid "I<Version 2>"
msgstr "I<Version 2>"
#. type: Plain text
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
msgid ""
"devscripts version 2.6.90: The first incarnation of the current style of "
"I<watch> files."
@@ -18936,13 +18990,13 @@ msgstr ""
"fichier I<watch>."
#. type: TP
-#: ../scripts/uscan.1:529
+#: ../scripts/uscan.1:535
#, no-wrap
msgid "I<Version 3>"
msgstr "I<Version 3>"
#. type: Plain text
-#: ../scripts/uscan.1:535
+#: ../scripts/uscan.1:541
msgid ""
"devscripts version 2.8.12: Introduced the following: correct handling of "
"regex special characters in the path part, directory/path pattern matching, "
@@ -18956,7 +19010,7 @@ msgstr ""
"modification des liens."
#. type: Plain text
-#: ../scripts/uscan.1:541
+#: ../scripts/uscan.1:547
msgid ""
"If you are upgrading from version 2, the key incompatibility is if you have "
"multiple groups in the pattern part; whereas only the first one would be "
@@ -18972,12 +19026,12 @@ msgstr ""
"groupe ordinaire (...)."
#. type: Plain text
-#: ../scripts/uscan.1:547
+#: ../scripts/uscan.1:553
msgid "B<dpkg>(1), B<perlre>(1), B<uupdate>(1) and B<devscripts.conf>(5)."
msgstr "B<dpkg>(1), B<perlre>(1), B<uupdate>(1) et B<devscripts.conf>(5)."
#. type: Plain text
-#: ../scripts/uscan.1:552
+#: ../scripts/uscan.1:558
msgid ""
"The original version of B<uscan> was written by Christoph Lameter "
"E<lt>clameter at debian.orgE<gt>. Significant improvements, changes and "
@@ -19950,23 +20004,23 @@ msgid "B<-a>, B<--wrap-always>"
msgstr "B<-a>, B<--wrap-always>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
msgid ""
"Wrap all package lists in the Debian I<control> file even if the entries are "
-"shorter than 80 characters and could fit in one line line."
+"shorter than 80 characters and could fit in one line."
msgstr ""
"Renvoie à la ligne toutes les listes de paquets du fichier I<control> "
"Debian, même si la liste est plus courte que 80 caractères et pourrait être "
"contenue en une ligne. "
#. type: TP
-#: ../doc/wrap-and-sort.1:42
+#: ../doc/wrap-and-sort.1:41
#, no-wrap
msgid "B<-s>, B<--short-indent>"
msgstr "B<-s>, B<--short-indent>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
msgid ""
"Only indent wrapped lines by one space (default is in-line with the field "
"name)."
@@ -19975,24 +20029,24 @@ msgstr ""
"alignées avec le nom du champ)."
#. type: TP
-#: ../doc/wrap-and-sort.1:46
+#: ../doc/wrap-and-sort.1:45
#, no-wrap
msgid "B<-b>, B<--sort-binary-packages>"
msgstr "B<-b>, B<--sort-binary-packages>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
msgid "Sort binary package paragraphs by name."
msgstr "Trier les paragraphes du paquet binaire par nom."
#. type: TP
-#: ../doc/wrap-and-sort.1:49
+#: ../doc/wrap-and-sort.1:48
#, no-wrap
msgid "B<-k>, B<--keep-first>"
msgstr "B<-k>, B<--keep-first>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
msgid ""
"When sorting binary package paragraphs, leave the first one at the top. "
"Unqualified B<debhelper>(7) configuration files are applied to the first "
@@ -20003,35 +20057,35 @@ msgstr ""
"appliqués au premier paquet."
#. type: TP
-#: ../doc/wrap-and-sort.1:55
+#: ../doc/wrap-and-sort.1:54
#, no-wrap
msgid "B<-n>, B<--no-cleanup>"
msgstr "B<-n>, B<--no-cleanup>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
msgid "Do not remove trailing whitespaces."
msgstr "Ne pas supprimer les blancs."
#. type: TP
-#: ../doc/wrap-and-sort.1:58
+#: ../doc/wrap-and-sort.1:57
#, no-wrap
msgid "B<-d >I<path>, B<--debian-directory=>I<path>"
msgstr "B<-d> I<chemin>, B<--directory=>I<chemin>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
msgid "Location of the I<debian> directory (default: I<./debian>)."
msgstr "Emplacement du répertoire I<debian> (I<./debian> par défaut)."
#. type: TP
-#: ../doc/wrap-and-sort.1:61
+#: ../doc/wrap-and-sort.1:60
#, no-wrap
msgid "B<-f >I<file>, B<--file=>I<file>"
msgstr "B<-f> I<fichier>, B<--file=>I<fichier>"
#. type: Plain text
-#: ../doc/wrap-and-sort.1:66
+#: ../doc/wrap-and-sort.1:65
msgid ""
"Wrap and sort only the specified I<file>. You can specify this parameter "
"multiple times. All supported files will be processed if no files are "
@@ -20042,12 +20096,12 @@ msgstr ""
"aucun fichier n'est indiqué."
#. type: Plain text
-#: ../doc/wrap-and-sort.1:69
+#: ../doc/wrap-and-sort.1:68
msgid "Print all files that are touched."
msgstr "Afficher tous les fichiers modifiés."
#. type: Plain text
-#: ../doc/wrap-and-sort.1:73
+#: ../doc/wrap-and-sort.1:72
msgid ""
"B<wrap-and-sort> and this manpage have been written by Benjamin Drung "
"E<lt>bdrung at debian.orgE<gt>."
@@ -20204,6 +20258,32 @@ msgstr ""
"Cette page de manuel a été écrite pour le paquet B<devscripts> par le "
"responsable du paquet, Julian Gilbey E<lt>jdg at debian.orgE<gt>."
+#~ msgid ""
+#~ "B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
+#~ "message=>I<text>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] "
+#~ "[B<--changelog=>I<path>] [B<--all> | I<files to commit>]"
+#~ msgstr ""
+#~ "B<debcommit> [B<--release>] [B<--release-use-changelog>] [B<--"
+#~ "message=>I<texte>] [B<--noact>] [B<--diff>] [B<--confirm>] [B<--edit>] "
+#~ "[B<--changelog=>I<chemin>] [B<--all> | I<fichiers à commiter>]"
+
+#~ msgid "I<files to commit>"
+#~ msgstr "I<fichiers à commiter>"
+
+#~ msgid ""
+#~ "Specify which files to commit (debian/changelog is added to the list "
+#~ "automatically.)"
+#~ msgstr ""
+#~ "Indiquer quels fichiers envoyer (debian/changelog est automatiquement "
+#~ "ajouté à la liste)."
+
+#~ msgid ""
+#~ "Unpack the downloaded orig tarball to the current directory, replacing "
+#~ "everything except the debian directory. Valid choices are:"
+#~ msgstr ""
+#~ "Dépaqueter l'archive amont téléchargée dans le répertoire actuel, en "
+#~ "remplaçant tout sauf le répertoire I<debian>. Les choix possibles sont :"
+
#~ msgid "B<--tar-only>"
#~ msgstr "B<--tar-only>"
--
Git repository for devscripts
More information about the devscripts-devel
mailing list