From aa57a5799afda71dd5750b05bfaccd9ec74e5c08 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Jan 2019 17:50:48 +0000
Subject: i18n-commit - autogenerated

---
 po4a/git-debrebase_1.pot | 219 ++++++++++++++++++++++++++---------------------
 1 file changed, 123 insertions(+), 96 deletions(-)

(limited to 'po4a/git-debrebase_1.pot')

diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot
index 72f8b5a..630039b 100644
--- a/po4a/git-debrebase_1.pot
+++ b/po4a/git-debrebase_1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 12:36+0100\n"
+"POT-Creation-Date: 2019-01-06 17:50+0000\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"
@@ -27,17 +27,17 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:496 ../git-debrebase.1.pod:441
+#: ../dgit.1:496 ../git-debrebase.1.pod:462
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -468,27 +468,54 @@ msgstr ""
 
 #. type: =item
 #: ../git-debrebase.1.pod:257
+msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
+msgstr ""
+
+#. type: =item
+#: ../git-debrebase.1.pod:259
 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:259
+#: ../git-debrebase.1.pod:261
+msgid "Cnnverts any of the following into a git-debrebase interchange branch:"
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:267
+msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:271
 msgid ""
-"Cnnverts a gbp patches-unapplied branch (not a gbp pq patch queue branch)  "
-"into a git-debrebase interchange branch."
+"a patches-unapplied git packaging branch containing debian/patches, as used "
+"with quilt"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:263
+#: ../git-debrebase.1.pod:276
 msgid ""
-"This is done by generating a new anchor merge, converting the quilt patches "
-"as a delta queue, and dropping the patches from the tree."
+"a git branch for a package which has no Debian delta - ie where upstream "
+"files are have not been modified in Debian, so there are no patches"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:267
+#: ../git-debrebase.1.pod:282
+msgid "(These two commands operate identically and are simply aliases.)"
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:284
 msgid ""
-"The upstream commit-ish should correspond to the gbp upstream branch, if "
+"The conversion is done by generating a new anchor merge, converting any "
+"quilt patches as a delta queue, and dropping the patches from the tree."
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:288
+msgid ""
+"The upstream commit-ish should correspond to the upstream branch or tag, if "
 "there is one.  It is a snag if it is not an ancestor of HEAD, or if the "
 "history between the upstream and HEAD contains commits which make changes to "
 "upstream files.  If it is not specified, the same algorithm is used as for "
@@ -496,7 +523,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:275
+#: ../git-debrebase.1.pod:296
 msgid ""
 "It is also a snag if the specified upstream has a debian/ subdirectory.  "
 "This check exists to detect certain likely user errors, but if this "
@@ -504,7 +531,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:281
+#: ../git-debrebase.1.pod:302
 msgid ""
 "git-debrebase will try to look for the dgit archive view of the most recent "
 "release, and if it finds it will make a pseduomerge so that your new git-"
@@ -512,14 +539,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:286
+#: ../git-debrebase.1.pod:307
 msgid ""
 "The result is a well-formed git-debrebase interchange branch.  The result is "
-"also fast-forward from the gbp branch."
+"also fast-forward from the original branch."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:289
+#: ../git-debrebase.1.pod:310
 msgid ""
 "It is a snag if the new branch looks like it will have diverged, just as for "
 "a laundering/unstitching call to git-debrebase; See L</Establish the current "
@@ -527,48 +554,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:293
+#: ../git-debrebase.1.pod:314
 msgid ""
-"Note that it is dangerous not to know whether you are dealing with a gbp "
+"Note that it is dangerous not to know whether you are dealing with a (gbp) "
 "patches-unapplied branch containing quilt patches, or a git-debrebase "
 "interchange branch.  At worst, using the wrong tool for the branch format "
 "might result in a dropped patch queue!"
 msgstr ""
 
 #. type: =head1
-#: ../git-debrebase.1.pod:302
+#: ../git-debrebase.1.pod:323
 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:306
+#: ../git-debrebase.1.pod:327
 msgid "git-debrebase breakwater"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:308
+#: ../git-debrebase.1.pod:329
 msgid ""
 "Prints the breakwater tip commitid.  If your HEAD branch is not fully "
 "laundered, prints the tip of the so-far-laundered breakwater."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:312
+#: ../git-debrebase.1.pod:333
 msgid "git-debrebase anchor"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:314
+#: ../git-debrebase.1.pod:335
 msgid "Prints the breakwater anchor commitid."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:316
+#: ../git-debrebase.1.pod:337
 msgid "git-debrebase analyse"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:318
+#: ../git-debrebase.1.pod:339
 msgid ""
 "Walks the history of the current branch, most recent commit first, back "
 "until the most recent anchor, printing the commit object id, and commit type "
@@ -576,31 +603,31 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:326
+#: ../git-debrebase.1.pod:347
 msgid "git-debrebase record-ffq-prev"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:328
+#: ../git-debrebase.1.pod:349
 msgid ""
 "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING "
 "AND LAUNDERING>, but does not launder the branch or move HEAD."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:332
+#: ../git-debrebase.1.pod:353
 msgid ""
 "It is an error if the ffq-prev could not be recorded.  It is also an error "
 "if an ffq-prev has already been recorded, unless --noop-ok."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:336
+#: ../git-debrebase.1.pod:357
 msgid "git-debrebase launder-v0"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:338
+#: ../git-debrebase.1.pod:359
 msgid ""
 "Launders the branch without recording anything in ffq-prev.  Then prints "
 "some information about the current branch.  Do not use this operation; it "
@@ -608,12 +635,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:343
+#: ../git-debrebase.1.pod:364
 msgid "git-debrebase convert-to-gbp"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:345
+#: ../git-debrebase.1.pod:366
 msgid ""
 "Converts a laundered branch into a gbp patches-unapplied branch containing "
 "quilt patches.  The result is not fast forward from the interchange branch, "
@@ -621,7 +648,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:350
+#: ../git-debrebase.1.pod:371
 msgid ""
 "This is provided mostly for the test suite and for unusual situations.  It "
 "should only be used with a care and with a proper understanding of the "
@@ -629,19 +656,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:355
+#: ../git-debrebase.1.pod:376
 msgid ""
 "Be sure to not accidentally treat the result as a git-debrebase branch, or "
 "you will drop all the patches!"
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:359
+#: ../git-debrebase.1.pod:380
 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:361
+#: ../git-debrebase.1.pod:382
 msgid ""
 "Converts any dgit-compatible git branch corresponding to a (possibly "
 "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
@@ -649,7 +676,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:365
+#: ../git-debrebase.1.pod:386
 msgid ""
 "This operation should not be used if the branch is already in git-debrebase "
 "form.  Normally git-debrebase will refuse to continue in this case (or "
@@ -657,7 +684,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:370
+#: ../git-debrebase.1.pod:391
 msgid ""
 "Some representation of the original upstream source code will be needed.  If "
 "I<upstream> is supplied, that must be a suitable upstream commit.  By "
@@ -666,7 +693,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:376
+#: ../git-debrebase.1.pod:397
 msgid ""
 "The upstream source must be exactly right and all the patches in debian/"
 "patches must be up to date.  Applying the patches from debian/patches to the "
@@ -674,7 +701,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:381
+#: ../git-debrebase.1.pod:402
 msgid ""
 "The output is laundered and stitched.  The resulting history is not "
 "particularly pretty, especially if orig tarball(s) were imported to produce "
@@ -682,31 +709,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:386
+#: ../git-debrebase.1.pod:407
 msgid ""
 "The available convert-options are as follows.  (These must come after "
 "convert-from-dgit-view.)"
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:391
+#: ../git-debrebase.1.pod:412
 msgid "--[no-]diagnose"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:393
+#: ../git-debrebase.1.pod:414
 msgid ""
 "Print additional error messages to help diagnose failure to find an "
 "appropriate upstream.  --no-diagnose is the default."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:397
+#: ../git-debrebase.1.pod:418
 msgid "--build-products-dir"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:399
+#: ../git-debrebase.1.pod:420
 msgid ""
 "Directory to look in for orig tarballs.  The default is the git config "
 "option dgit.default.build-products-dir or failing that, C<..>.  Passed on to "
@@ -714,35 +741,35 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:405
+#: ../git-debrebase.1.pod:426
 msgid "--[no-]origs"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:407
+#: ../git-debrebase.1.pod:428
 msgid ""
 "Whether to try to look for or use any orig tarballs.  --origs is the default."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:410
+#: ../git-debrebase.1.pod:431
 msgid "--[no-]tags"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:412
+#: ../git-debrebase.1.pod:433
 msgid ""
 "Whether to try to look for or use any upstream git tags.  --tags is the "
 "default."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:415
+#: ../git-debrebase.1.pod:436
 msgid "--always-convert-anyway"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:417
+#: ../git-debrebase.1.pod:438
 msgid ""
 "Perform the conversion operation, producing unpleasant extra history, even "
 "if the branch seems to be in git-debrebase form already.  This should not be "
@@ -750,12 +777,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:425
+#: ../git-debrebase.1.pod:446
 msgid "git-debrebase forget-was-ever-debrebase"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:427
+#: ../git-debrebase.1.pod:448
 msgid ""
 "Deletes the ffq-prev and debrebase-last refs associated with this branch, "
 "that git-debrebase and dgit use to determine whether this branch is managed "
@@ -763,19 +790,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:433
+#: ../git-debrebase.1.pod:454
 msgid ""
 "This can be useful if you were just playing with git-debrebase, and have "
 "used git-reset --hard to go back to a commit before your experiments."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:437
+#: ../git-debrebase.1.pod:458
 msgid "Do not use this if you expect to run git-debrebase on the branch again."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:443
+#: ../git-debrebase.1.pod:464
 msgid ""
 "This section documents the general options to git-debrebase (ie, the ones "
 "which immediately follow git-debrebase or git debrebase on the command "
@@ -784,78 +811,78 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:455
+#: ../git-debrebase.1.pod:476
 msgid "-f<snag-id>"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:457
+#: ../git-debrebase.1.pod:478
 msgid "Turns snag(s) with id <snag-id> into warnings."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:459
+#: ../git-debrebase.1.pod:480
 msgid ""
 "Some troublesome things which git-debrebase encounters are B<snag>s.  (The "
 "specific instances are discussed in the text for the relevant operation.)"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:464
+#: ../git-debrebase.1.pod:485
 msgid ""
 "When a snag is detected, a message is printed to stderr containing the snag "
 "id (in the form C<-f<snag-idE<gt>>), along with some prose."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:469
+#: ../git-debrebase.1.pod:490
 msgid ""
 "If snags are detected, git-debrebase does not continue, unless the relevant -"
 "f<snag-id> is specified, or --force is specified."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:473
+#: ../git-debrebase.1.pod:494
 msgid "--force"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:475
+#: ../git-debrebase.1.pod:496
 msgid "Turns all snags into warnings.  See the -f<snag-id> option."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:478
+#: ../git-debrebase.1.pod:499
 msgid ""
 "Do not invoke git-debrebase --force in scripts and aliases; instead, specify "
 "the particular -f<snag-id> for expected snags."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:481
+#: ../git-debrebase.1.pod:502
 msgid "--noop-ok"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:483
+#: ../git-debrebase.1.pod:504
 msgid ""
 "Suppresses the error in some situations where git-debrebase does nothing, "
 "because there is nothing to do."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:487
+#: ../git-debrebase.1.pod:508
 msgid ""
 "The specific instances are discussed in the text for the relvant operation."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:490
+#: ../git-debrebase.1.pod:511
 msgid "--anchor=<commit-ish>"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:492
+#: ../git-debrebase.1.pod:513
 msgid ""
 "Treats <commit-ish> as an anchor.  This overrides the usual logic which "
 "automatically classifies commits as anchors, pseudomerges, delta queue "
@@ -863,7 +890,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:496
+#: ../git-debrebase.1.pod:517
 msgid ""
 "It also disables some coherency checks which depend on metadata extracted "
 "from its commit message, so it is a snag if <commit-ish> is the anchor for "
@@ -871,41 +898,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:503
+#: ../git-debrebase.1.pod:524
 msgid "--dgit=<program>"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:505
+#: ../git-debrebase.1.pod:526
 msgid ""
 "Run <program>, instead of dgit from PATH, when invocation of dgit is "
 "necessary.  This is provided mostly for the benefit of the test suite."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:509
+#: ../git-debrebase.1.pod:530
 msgid "-D"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:511
+#: ../git-debrebase.1.pod:532
 msgid "Requests (more) debugging.  May be repeated."
 msgstr ""
 
 #. type: =item
-#: ../git-debrebase.1.pod:513
+#: ../git-debrebase.1.pod:534
 msgid "--experimntal-merge-resolution"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:515
+#: ../git-debrebase.1.pod:536
 msgid ""
 "Enable experimental code for handling general merges (see L<git-debrebase(5)/"
 "General merges>)."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:518
+#: ../git-debrebase.1.pod:539
 msgid ""
 "This option may generate lossage of various kinds, including misleading "
 "error messages, references to nonexistent documentation, and you being "
@@ -913,24 +940,24 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../git-debrebase.1.pod:526
+#: ../git-debrebase.1.pod:547
 msgid "UNSTITCHING AND LAUNDERING"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:528
+#: ../git-debrebase.1.pod:549
 msgid ""
 "Several operations unstitch and launder the branch first.  In detail this "
 "means:"
 msgstr ""
 
 #. type: =head2
-#: ../git-debrebase.1.pod:531
+#: ../git-debrebase.1.pod:552
 msgid "Establish the current branch's ffq-prev"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:533
+#: ../git-debrebase.1.pod:554
 msgid ""
 "If ffq-prev is not yet recorded, git-debrebase checks that the current "
 "branch is ahead of relevant remote tracking branches.  The relevant branches "
@@ -938,30 +965,30 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:545
+#: ../git-debrebase.1.pod:566
 msgid ""
 "The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
 "remote);"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:550
+#: ../git-debrebase.1.pod:571
 msgid ""
 "The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:555
+#: ../git-debrebase.1.pod:576
 msgid "For local dgit suite branches, the corresponding tracking remote;"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:560
+#: ../git-debrebase.1.pod:581
 msgid "If you are on C<master>, remotes/dgit/dgit/sid."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:565
+#: ../git-debrebase.1.pod:586
 msgid ""
 "The apparently relevant ref names to check are filtered through branch."
 "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
@@ -969,7 +996,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:570
+#: ../git-debrebase.1.pod:591
 msgid ""
 "In each case it is a snag if the local HEAD is behind the checked remote, or "
 "if local HEAD has diverged from it.  All the checks are done locally using "
@@ -978,31 +1005,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:576
+#: ../git-debrebase.1.pod:597
 msgid ""
 "If these checks pass, or are forced, git-debrebse then records the current "
 "tip as ffq-prev."
 msgstr ""
 
 #. type: =head2
-#: ../git-debrebase.1.pod:580
+#: ../git-debrebase.1.pod:601
 msgid "Examine the branch"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:582
+#: ../git-debrebase.1.pod:603
 msgid ""
 "git-debrebase analyses the current HEAD's history to find the anchor in its "
 "breakwater, and the most recent breakwater tip."
 msgstr ""
 
 #. type: =head2
-#: ../git-debrebase.1.pod:587
+#: ../git-debrebase.1.pod:608
 msgid "Rewrite the commits into laundered form"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:589
+#: ../git-debrebase.1.pod:610
 msgid ""
 "Mixed debian+upstream commits are split into two commits each.  Delta queue "
 "(upstream files) commits bubble to the top.  Pseudomerges, and quilt patch "
@@ -1010,13 +1037,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:595
+#: ../git-debrebase.1.pod:616
 msgid ""
 "This rewrite will always succeed, by construction.  The result is the "
 "laundered branch."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:600
+#: ../git-debrebase.1.pod:621
 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)"
 msgstr ""
-- 
cgit v1.2.3