i18n-commit - autogenerated

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 68 insertions, 68 deletions

diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot
index dd85124..d50bc95 100644
--- a/po4a/dgit-sponsorship_7.pot
+++ b/po4a/dgit-sponsorship_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2022-12-29 00:50+0000\n"
+"POT-Creation-Date: 2024-04-11 22:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,12 +28,12 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125
-#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139
+#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139
 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140
-#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678
+#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140
+#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678
 #: ../git-debpush.1.pod:261
 #, no-wrap
 msgid "SEE ALSO"
@@ -45,7 +45,7 @@ msgid "INTRODUCTION AND SCOPE"
 msgstr ""
 
 #. type: verbatim
-#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:173
+#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:176
 #, no-wrap
 msgid ""
 "    % dgit --gbp push-source\n"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: =item
 #: ../dgit-sponsorship.7.pod:68 ../dgit-sponsorship.7.pod:72
-#: ../dgit-sponsorship.7.pod:79 ../dgit-sponsorship.7.pod:84
+#: ../dgit-sponsorship.7.pod:80 ../dgit-sponsorship.7.pod:85
 msgid "*"
 msgstr ""
 
@@ -176,19 +176,19 @@ msgstr ""
 #. type: textblock
 #: ../dgit-sponsorship.7.pod:74
 msgid ""
-"Any .orig tarballs which will be needed, or sample git-archive(1)  or gbp-"
-"buildpackage(1)  command(s) to generate them."
+"Any .orig tarballs which will be needed, or sample git-deborig(1), git-"
+"archive(1)  or gbp-buildpackage(1)  command(s) to generate them."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:81
+#: ../dgit-sponsorship.7.pod:82
 msgid ""
 "A sample dgit push-source command, containing any dgit --quilt=, --gbp or --"
 "dpm option needed"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:86
+#: ../dgit-sponsorship.7.pod:87
 msgid ""
 "Plus of course all the usual information about the state of the package, any "
 "caveats or areas you would like the sponsor to focus their review, "
@@ -196,7 +196,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:93
+#: ../dgit-sponsorship.7.pod:94
 msgid ""
 "If the handoff is done by email, the elements above should be a in a single, "
 "signed, message.  This could be an RFS submission against the sponsorship-"
@@ -204,61 +204,61 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../dgit-sponsorship.7.pod:98
+#: ../dgit-sponsorship.7.pod:99
 msgid "git branch"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:102
+#: ../dgit-sponsorship.7.pod:103
 msgid ""
 "The sponsee should push their HEAD as a git branch to any suitable git "
 "server.  They can use their own git server; salsa is another possibility."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:107
+#: ../dgit-sponsorship.7.pod:108
 msgid ""
 "The branch names used by the sponsee on their local machine, and on the "
 "server, do not matter."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:110
+#: ../dgit-sponsorship.7.pod:111
 msgid ""
 "Instead, the sponsee should include the git commit id of their HEAD in their "
 "handover email."
 msgstr ""
 
 #. type: =head3
-#: ../dgit-sponsorship.7.pod:116
+#: ../dgit-sponsorship.7.pod:117
 msgid "orig tarballs"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:120
+#: ../dgit-sponsorship.7.pod:121
 msgid ""
 "If there are any .origs that are not in the archive already, the sponsor "
 "will need them as part of the upload."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:123
+#: ../dgit-sponsorship.7.pod:124
 msgid ""
-"If the sponsee generated these tarballs with git-archive(1)  or gbp-"
-"buildpackage(1), they can simply include a sample invocation of git-"
-"archive(1)  or ensure that a suitable gbp.conf is present in the source "
-"package to generate the tarball."
+"If the sponsee generated these tarballs with git-deborig(1), git-archive(1)  "
+"or gbp-buildpackage(1), they can simply include a sample invocation of git-"
+"deborig(1) or git-archive(1)  or ensure that a suitable gbp.conf is present "
+"in the source package to generate the tarball."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:130
+#: ../dgit-sponsorship.7.pod:133
 msgid ""
 "Otherwise, the simplest approach is to commit the orig tarballs with "
 "pristine-tar(1), e.g."
 msgstr ""
 
 #. type: verbatim
-#: ../dgit-sponsorship.7.pod:136
+#: ../dgit-sponsorship.7.pod:139
 #, no-wrap
 msgid ""
 "    % pristine-tar commit ../foo_1.2.3.orig.tar.xz upstream/1.2.3\n"
@@ -266,7 +266,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:140
+#: ../dgit-sponsorship.7.pod:143
 msgid ""
 "and be sure to push the pristine-tar branch.  If you are using git-"
 "buildpackage(1), just pass I<--git-pristine-tar> and I<--git-pristine-tar-"
@@ -274,33 +274,33 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:144
+#: ../dgit-sponsorship.7.pod:147
 msgid ""
 "Alternatively, the sponsee can put them on a suitable webserver, or attach "
 "to the e-mail, if they are small."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:149
+#: ../dgit-sponsorship.7.pod:152
 msgid ""
 "The sponsee should quote sha256sums of the .origs in their handoff email, "
 "unless they supplied commands to generate them."
 msgstr ""
 
 #. type: =head3
-#: ../dgit-sponsorship.7.pod:155
+#: ../dgit-sponsorship.7.pod:158
 msgid "quilt options"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:159
+#: ../dgit-sponsorship.7.pod:162
 msgid ""
 "Some workflows involve git branches which are not natively dgit-compatible.  "
 "Normally dgit will convert them as needed, during push."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:163
+#: ../dgit-sponsorship.7.pod:166
 msgid ""
 "Supply a sample \"dgit push-source\" command including any C<--gbp> (aka C<--"
 "quilt=gbp>), C<--dpm> (aka C<--quilt=dpm>), or other C<--quilt=> option they "
@@ -308,27 +308,27 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../dgit-sponsorship.7.pod:179
+#: ../dgit-sponsorship.7.pod:182
 msgid "SPONSOR WORKFLOW"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:181 ../dgit-sponsorship.7.pod:273
+#: ../dgit-sponsorship.7.pod:184 ../dgit-sponsorship.7.pod:276
 msgid "This part is addressed to the sponsor:"
 msgstr ""
 
 #. type: =head2
-#: ../dgit-sponsorship.7.pod:183
+#: ../dgit-sponsorship.7.pod:186
 msgid "Receiving and validating the sponsorship request"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:185
+#: ../dgit-sponsorship.7.pod:188
 msgid "You should check the signature on the email."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:187
+#: ../dgit-sponsorship.7.pod:190
 msgid ""
 "Use C<git fetch> or C<git clone> to obtain the git branch prepared by your "
 "sponsee, and obtain any .origs mentioned by the sponsee (to extract .origs "
@@ -337,24 +337,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:194
+#: ../dgit-sponsorship.7.pod:197
 msgid ""
 "Check the git commit ID of the sponsee's branch tip, and the sha256sums of "
 "the .origs, against the handoff email."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:198
+#: ../dgit-sponsorship.7.pod:201
 msgid "Now you can check out the branch tip, and do your substantive review."
 msgstr ""
 
 #. type: =head2
-#: ../dgit-sponsorship.7.pod:201
+#: ../dgit-sponsorship.7.pod:204
 msgid "Dealing with branches that want --quilt="
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:203
+#: ../dgit-sponsorship.7.pod:206
 msgid ""
 "If your sponsee mentioned a C<--quilt> option, and you don't want to grapple "
 "with their preferred tree format, you can convert their tree into the "
@@ -362,7 +362,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../dgit-sponsorship.7.pod:209
+#: ../dgit-sponsorship.7.pod:212
 #, no-wrap
 msgid ""
 "    % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup\n"
@@ -371,33 +371,33 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:214
+#: ../dgit-sponsorship.7.pod:217
 msgid ""
 "You should check that what you're looking at is a descendant of the "
 "sponsee's branch."
 msgstr ""
 
 #. type: =head2
-#: ../dgit-sponsorship.7.pod:217
+#: ../dgit-sponsorship.7.pod:220
 msgid "Some hints which may help the review"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:219
+#: ../dgit-sponsorship.7.pod:222
 msgid ""
 "C<dgit fetch sid> will get you an up-to-date C<refs/remotes/dgit/dgit/sid> "
 "showing what's in the archive already."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:223
+#: ../dgit-sponsorship.7.pod:226
 msgid ""
 "C<dgit -wgf --damp-run push-source> will check that dgit can build an "
 "appropriate source package."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:226
+#: ../dgit-sponsorship.7.pod:229
 msgid ""
 "There is no need to run debdiff.  dgit will not upload anything that doesn't "
 "unpack to exactly the git commit you are pushing, so you can rely on what "
@@ -405,12 +405,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../dgit-sponsorship.7.pod:231
+#: ../dgit-sponsorship.7.pod:234
 msgid "Doing the upload"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:233
+#: ../dgit-sponsorship.7.pod:236
 msgid ""
 "When you have completed your source review, and use C<dgit -wgf [--"
 "quilt=...] sbuild -A -C> or similar, to to the build, and then C<dgit -wgf "
@@ -419,7 +419,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:242
+#: ../dgit-sponsorship.7.pod:245
 msgid ""
 "Check whether the sponsee made a debian/I<version> tag.  If they did, ensure "
 "you have their tag in the repository you are pushing from, or pass C<--no-"
@@ -428,7 +428,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:249
+#: ../dgit-sponsorship.7.pod:252
 msgid ""
 "(It is possible to upload from the quilt-cache dgit view.  If you want to do "
 "this, B<do not> pass the C<--quilt> or C<--gbp> or C<--dpm> options again, "
@@ -437,35 +437,35 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:257
+#: ../dgit-sponsorship.7.pod:260
 msgid ""
-"If this was the first upload done with dgit, you may need to pass C<--"
-"overwrite> to dgit."
+"If this was the first upload done with dgit, you may need to pass C<--trust-"
+"changelog> to dgit."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:262
+#: ../dgit-sponsorship.7.pod:265
 msgid ""
 "Alternatively, if this was the first ever dgit push of the package, you can "
-"pass C<--deliberately-not-fast-forward> instead of C<--overwrite>.  This "
-"avoids introducing a new origin commit into the dgit view of the sponsee's "
-"git history which is unnecessary and could be confusing."
+"pass C<--deliberately-not-fast-forward> instead of C<--trust-changelog>.  "
+"This avoids introducing a new origin commit into the dgit view of the "
+"sponsee's git history which is unnecessary and could be confusing."
 msgstr ""
 
 #. type: =head1
-#: ../dgit-sponsorship.7.pod:271
+#: ../dgit-sponsorship.7.pod:274
 msgid "SPONSORING A NON-GIT-USING SPONSEE"
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:275
+#: ../dgit-sponsorship.7.pod:278
 msgid ""
 "If your sponsee does not use git, you can still do your review with git, and "
 "use dgit for the upload."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:279
+#: ../dgit-sponsorship.7.pod:282
 msgid ""
 "Your sponsee will provide you with a source package: that is, a .dsc and the "
 "files it refers to.  Obtain these files, and check signatures as "
@@ -473,7 +473,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../dgit-sponsorship.7.pod:286
+#: ../dgit-sponsorship.7.pod:289
 #, no-wrap
 msgid ""
 "    % dgit clone PACKAGE\n"
@@ -484,12 +484,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:293
+#: ../dgit-sponsorship.7.pod:296
 msgid "Or for an entirely new package:"
 msgstr ""
 
 #. type: verbatim
-#: ../dgit-sponsorship.7.pod:297
+#: ../dgit-sponsorship.7.pod:300
 #, no-wrap
 msgid ""
 "    % mkdir PACKAGE\n"
@@ -500,14 +500,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:304
+#: ../dgit-sponsorship.7.pod:307
 msgid ""
 "This will leave you looking at the sponsee's package, formatted as a dgit "
 "branch."
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:307
+#: ../dgit-sponsorship.7.pod:310
 msgid ""
 "When you have finished your review and your tests, you can do the dgit push-"
 "source (or dgit sbuild and dgit push-built)  directly from the \"sponsee\" "
@@ -515,9 +515,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:313
+#: ../dgit-sponsorship.7.pod:316
 msgid ""
-"You will need to pass C<--overwrite> to dgit push for every successive "
+"You will need to pass C<--trust-changelog> to dgit push for every successive "
 "upload.  This disables a safety catch which would normally spot situations "
 "where changes are accidentally lost.  When your sponsee is sending you "
 "source packages - perhaps multiple source packages with the same version "
@@ -525,6 +525,6 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../dgit-sponsorship.7.pod:324
+#: ../dgit-sponsorship.7.pod:327
 msgid "dgit(1), dgit(7), dgit-nmu-simple(7), dgit-maint-*(7)"
 msgstr ""