X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=po4a%2Fgit-debrebase_1.pot;h=72f8b5ac7e031c4abe642c5e8ad08c701b1c163a;hp=b38a193cb219380f0643656337a01d32c3e0f6aa;hb=9e8a8c1d5abdbdbbe8f7edffd9b3de6ba5edbb4d;hpb=b8915f4994da5c3d29e932e892c7eb7263430e6d

diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot
index b38a193c..72f8b5ac 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 01:04+0100\n"
+"POT-Creation-Date: 2018-10-04 12:36+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"
@@ -37,7 +37,7 @@ msgstr ""
 #: ../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:601
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -907,32 +907,30 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.1.pod:518
 msgid ""
-"This option may generate branch structures that require the use of this same "
-"option by other people.  Also you may experience lossage of various kinds, "
-"including false error messages, references to nonexistent documentation, "
-"being handed an incomprehensible pile of multidimensional merge wreckage, "
-"and/or possible mangling of your package's source code."
+"This option may generate lossage of various kinds, including misleading "
+"error messages, references to nonexistent documentation, and you being "
+"handed an incomprehensible pile of multidimensional merge wreckage."
 msgstr ""
 
 #. type: =head1
-#: ../git-debrebase.1.pod:529
+#: ../git-debrebase.1.pod:526
 msgid "UNSTITCHING AND LAUNDERING"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:531
+#: ../git-debrebase.1.pod:528
 msgid ""
 "Several operations unstitch and launder the branch first.  In detail this "
 "means:"
 msgstr ""
 
 #. type: =head2
-#: ../git-debrebase.1.pod:534
+#: ../git-debrebase.1.pod:531
 msgid "Establish the current branch's ffq-prev"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:536
+#: ../git-debrebase.1.pod:533
 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 "
@@ -940,30 +938,30 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:548
+#: ../git-debrebase.1.pod:545
 msgid ""
 "The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
 "remote);"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:553
+#: ../git-debrebase.1.pod:550
 msgid ""
 "The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:558
+#: ../git-debrebase.1.pod:555
 msgid "For local dgit suite branches, the corresponding tracking remote;"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:563
+#: ../git-debrebase.1.pod:560
 msgid "If you are on C<master>, remotes/dgit/dgit/sid."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:568
+#: ../git-debrebase.1.pod:565
 msgid ""
 "The apparently relevant ref names to check are filtered through branch."
 "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
@@ -971,7 +969,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:573
+#: ../git-debrebase.1.pod:570
 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 "
@@ -980,31 +978,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:579
+#: ../git-debrebase.1.pod:576
 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:583
+#: ../git-debrebase.1.pod:580
 msgid "Examine the branch"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:585
+#: ../git-debrebase.1.pod:582
 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:590
+#: ../git-debrebase.1.pod:587
 msgid "Rewrite the commits into laundered form"
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:592
+#: ../git-debrebase.1.pod:589
 msgid ""
 "Mixed debian+upstream commits are split into two commits each.  Delta queue "
 "(upstream files) commits bubble to the top.  Pseudomerges, and quilt patch "
@@ -1012,13 +1010,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:598
+#: ../git-debrebase.1.pod:595
 msgid ""
 "This rewrite will always succeed, by construction.  The result is the "
 "laundered branch."
 msgstr ""
 
 #. type: textblock
-#: ../git-debrebase.1.pod:603
+#: ../git-debrebase.1.pod:600
 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)"
 msgstr ""