summaryrefslogtreecommitdiff
path: root/po4a/git-debrebase_5.en_US.po
diff options
context:
space:
mode:
Diffstat (limited to 'po4a/git-debrebase_5.en_US.po')
-rw-r--r--po4a/git-debrebase_5.en_US.po1472
1 files changed, 0 insertions, 1472 deletions
diff --git a/po4a/git-debrebase_5.en_US.po b/po4a/git-debrebase_5.en_US.po
deleted file mode 100644
index e8ea8b7..0000000
--- a/po4a/git-debrebase_5.en_US.po
+++ /dev/null
@@ -1,1472 +0,0 @@
-# English translations for po package
-# Copyright (C) 2018 Free Software Foundation, Inc.
-# This file is distributed under the same license as the po package.
-# Automatically generated, 2018.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: po 4a\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
-"PO-Revision-Date: 2018-10-04 01:04+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: =head1
-#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
-#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
-#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
-#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
-#, no-wrap
-msgid "NAME"
-msgstr "NAME"
-
-#. type: =head1
-#: ../dgit.1:1394 ../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:601
-#: ../git-debrebase.5.pod:678
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "SEE ALSO"
-
-#. type: =head1
-#: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
-#: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
-#: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
-msgid "INTRODUCTION"
-msgstr "INTRODUCTION"
-
-#. type: textblock
-#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
-msgid ""
-"git-debrebase is a tool for representing in git, and manpulating, Debian "
-"packages based on upstream source code."
-msgstr ""
-"git-debrebase is a tool for representing in git, and manpulating, Debian "
-"packages based on upstream source code."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:3
-msgid "git-debrebase - git data model for Debian packaging"
-msgstr "git-debrebase - git data model for Debian packaging"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:11
-msgid ""
-"The Debian packaging has a fast forwarding history. The delta queue "
-"(changes to upstream files) is represented as a series of individual git "
-"commits, which can worked on with rebase, and also shared."
-msgstr ""
-"The Debian packaging has a fast forwarding history. The delta queue "
-"(changes to upstream files) is represented as a series of individual git "
-"commits, which can worked on with rebase, and also shared."
-
-#. type: =head2
-#: ../git-debrebase.5.pod:18
-msgid "DISCUSSION"
-msgstr "DISCUSSION"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:20
-msgid ""
-"git-debrebase is designed to work well with dgit. git-debrebase can also be "
-"used in workflows without source packages, for example to work on Debian-"
-"format packages outside or alongside Debian."
-msgstr ""
-"git-debrebase is designed to work well with dgit. git-debrebase can also be "
-"used in workflows without source packages, for example to work on Debian-"
-"format packages outside or alongside Debian."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:24
-msgid ""
-"git-debrebase itself is not very suitable for use by Debian derivatives, to "
-"work on packages inherited from Debian, because it assumes that you want to "
-"throw away any packaging provided by your upstream. However, use of git-"
-"debrebase in Debian does not make anything harder for derivatives, and it "
-"can make some things easier."
-msgstr ""
-"git-debrebase itself is not very suitable for use by Debian derivatives, to "
-"work on packages inherited from Debian, because it assumes that you want to "
-"throw away any packaging provided by your upstream. However, use of git-"
-"debrebase in Debian does not make anything harder for derivatives, and it "
-"can make some things easier."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:32
-msgid ""
-"When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
-"B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful "
-"output than the default."
-msgstr ""
-"When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
-"B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful "
-"output than the default."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:37
-msgid "TERMINOLOGY"
-msgstr "TERMINOLOGY"
-
-#. type: =item
-#: ../git-debrebase.5.pod:41
-msgid "Pseudomerge"
-msgstr "Pseudomerge"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:43
-msgid ""
-"A merge which does not actually merge the trees; instead, it is constructed "
-"by taking the tree from one of the parents (ignoring the contents of the "
-"other parents). These are used to make a rewritten history fast forward "
-"from a previous tip, so that it can be pushed and pulled normally. Manual "
-"construction of pseudomerges can be done with C<git merge -s ours> but is "
-"not normally needed when using git-debrebase."
-msgstr ""
-"A merge which does not actually merge the trees; instead, it is constructed "
-"by taking the tree from one of the parents (ignoring the contents of the "
-"other parents). These are used to make a rewritten history fast forward "
-"from a previous tip, so that it can be pushed and pulled normally. Manual "
-"construction of pseudomerges can be done with C<git merge -s ours> but is "
-"not normally needed when using git-debrebase."
-
-#. type: =item
-#: ../git-debrebase.5.pod:54
-msgid "Packaging files"
-msgstr "Packaging files"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:56
-msgid ""
-"Files in the source tree within B<debian/>, excluding anything in B<debian/"
-"patches/>."
-msgstr ""
-"Files in the source tree within B<debian/>, excluding anything in B<debian/"
-"patches/>."
-
-#. type: =item
-#: ../git-debrebase.5.pod:59
-msgid "Upstream"
-msgstr "Upstream"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:61
-msgid ""
-"The version of the package without Debian's packaging. Typically provided "
-"by the actual upstream project, and sometimes tracked by Debian contributors "
-"in a branch C<upstream>."
-msgstr ""
-"The version of the package without Debian's packaging. Typically provided "
-"by the actual upstream project, and sometimes tracked by Debian contributors "
-"in a branch C<upstream>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:65
-msgid ""
-"Upstream contains upstream files, but some upstreams also contain packaging "
-"files in B<debian/>. Any such non-upstream files found in upstream are "
-"thrown away by git-debrebase each time a new upstream version is "
-"incorporated."
-msgstr ""
-"Upstream contains upstream files, but some upstreams also contain packaging "
-"files in B<debian/>. Any such non-upstream files found in upstream are "
-"thrown away by git-debrebase each time a new upstream version is "
-"incorporated."
-
-#. type: =item
-#: ../git-debrebase.5.pod:71
-msgid "Upstream files"
-msgstr "Upstream files"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:73
-msgid ""
-"Files in the source tree outside B<debian/>. These may include unmodified "
-"source from upstream, but also files which have been modified or created for "
-"Debian."
-msgstr ""
-"Files in the source tree outside B<debian/>. These may include unmodified "
-"source from upstream, but also files which have been modified or created for "
-"Debian."
-
-#. type: =item
-#: ../git-debrebase.5.pod:77
-msgid "Delta queue"
-msgstr "Delta queue"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:79
-msgid "Debian's changes to upstream files: a series of git commits."
-msgstr "Debian's changes to upstream files: a series of git commits."
-
-#. type: =item
-#: ../git-debrebase.5.pod:82
-msgid "Quilt patches"
-msgstr "Quilt patches"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:84
-msgid ""
-"Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
-"(quilt) .dsc source package format. Not used, often deleted, and "
-"regenerated when needed (such as when uploading to Debian), by git-debrebase."
-msgstr ""
-"Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
-"(quilt) .dsc source package format. Not used, often deleted, and "
-"regenerated when needed (such as when uploading to Debian), by git-debrebase."
-
-#. type: =item
-#: ../git-debrebase.5.pod:90
-msgid "Interchange branch; breakwater; stitched; laundered"
-msgstr "Interchange branch; breakwater; stitched; laundered"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:92
-msgid "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
-msgstr "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
-
-#. type: =item
-#: ../git-debrebase.5.pod:94
-msgid "Anchor; Packaging"
-msgstr "Anchor; Packaging"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:96
-msgid "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
-msgstr "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
-
-#. type: =item
-#: ../git-debrebase.5.pod:98
-msgid "ffq-prev; debrebase-last"
-msgstr "ffq-prev; debrebase-last"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:100
-msgid "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
-msgstr "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:104
-msgid "DIAGRAM"
-msgstr "DIAGRAM"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:106
-#, no-wrap
-msgid ""
-" ------/--A!----/--B3!--%--/--> interchange view\n"
-" / / / with debian/ directory\n"
-" % % % entire delta queue applied\n"
-" / / / 3.0 (quilt) has debian/patches\n"
-" / / 3* \"master\" on Debian git servers\n"
-" / / /\n"
-" 2* 2* 2\n"
-" / / /\n"
-" 1 1 1 breakwater branch, merging baseline\n"
-" / / / unmodified upstream code\n"
-" ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n"
-" / / / no ref refers to this: we\n"
-" --#-----#-------#-----> upstream reconstruct its identity by\n"
-" inspecting interchange branch\n"
-" Key:\n"
-"\n"
-msgstr ""
-" ------/--A!----/--B3!--%--/--> interchange view\n"
-" / / / with debian/ directory\n"
-" % % % entire delta queue applied\n"
-" / / / 3.0 (quilt) has debian/patches\n"
-" / / 3* \"master\" on Debian git servers\n"
-" / / /\n"
-" 2* 2* 2\n"
-" / / /\n"
-" 1 1 1 breakwater branch, merging baseline\n"
-" / / / unmodified upstream code\n"
-" ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n"
-" / / / no ref refers to this: we\n"
-" --#-----#-------#-----> upstream reconstruct its identity by\n"
-" inspecting interchange branch\n"
-" Key:\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:122
-#, no-wrap
-msgid ""
-" 1,2,3 commits touching upstream files only\n"
-" A,B,C commits touching debian/ only\n"
-" B3 mixed commit (eg made by an NMUer)\n"
-" # upstream releases\n"
-"\n"
-msgstr ""
-" 1,2,3 commits touching upstream files only\n"
-" A,B,C commits touching debian/ only\n"
-" B3 mixed commit (eg made by an NMUer)\n"
-" # upstream releases\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:127
-#, no-wrap
-msgid ""
-" -@- anchor merge, takes contents of debian/ from the\n"
-" / previous `breakwater' commit and rest from upstream\n"
-"\n"
-msgstr ""
-" -@- anchor merge, takes contents of debian/ from the\n"
-" / previous `breakwater' commit and rest from upstream\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:130
-#, no-wrap
-msgid ""
-" -/- pseudomerge; contents are identical to\n"
-" / parent lower on diagram.\n"
-"\n"
-msgstr ""
-" -/- pseudomerge; contents are identical to\n"
-" / parent lower on diagram.\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:133
-#, no-wrap
-msgid ""
-" % dgit- or git-debrebase- generated commit of debian/patches.\n"
-" `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
-"\n"
-msgstr ""
-" % dgit- or git-debrebase- generated commit of debian/patches.\n"
-" `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:136
-#, no-wrap
-msgid ""
-" * Maintainer's HEAD was here while they were editing,\n"
-" before they said they were done, at which point their\n"
-" tools made -/- (and maybe %) to convert to\n"
-" the fast-forwarding interchange branch.\n"
-"\n"
-msgstr ""
-" * Maintainer's HEAD was here while they were editing,\n"
-" before they said they were done, at which point their\n"
-" tools made -/- (and maybe %) to convert to\n"
-" the fast-forwarding interchange branch.\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:141
-#, no-wrap
-msgid ""
-" ! NMUer's HEAD was here when they said `dgit push'.\n"
-" Rebase branch launderer turns each ! into an\n"
-" equivalent *.\n"
-"\n"
-msgstr ""
-" ! NMUer's HEAD was here when they said `dgit push'.\n"
-" Rebase branch launderer turns each ! into an\n"
-" equivalent *.\n"
-"\n"
-
-#. type: =head1
-#: ../git-debrebase.5.pod:145
-msgid "BRANCHES AND BRANCH STATES - OVERVIEW"
-msgstr "BRANCHES AND BRANCH STATES - OVERVIEW"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:147
-msgid ""
-"git-debrebase has one primary branch, the B<interchange branch>. This "
-"branch is found on Debian contributor's workstations (typically, a "
-"maintainer would call it B<master>), in the Debian dgit git server as the "
-"suite branch (B<dgit/dgit/sid>) and on other git servers which support "
-"Debian work (eg B<master> on salsa)."
-msgstr ""
-"git-debrebase has one primary branch, the B<interchange branch>. This "
-"branch is found on Debian contributor's workstations (typically, a "
-"maintainer would call it B<master>), in the Debian dgit git server as the "
-"suite branch (B<dgit/dgit/sid>) and on other git servers which support "
-"Debian work (eg B<master> on salsa)."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:155
-msgid ""
-"The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
-"necessary)."
-msgstr ""
-"The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
-"necessary)."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:158
-msgid ""
-"It is possible to have multiple different interchange branches for the same "
-"package, stored as different local and remote git branches. However, "
-"divergence should be avoided where possible - see L</OTHER MERGES>."
-msgstr ""
-"It is possible to have multiple different interchange branches for the same "
-"package, stored as different local and remote git branches. However, "
-"divergence should be avoided where possible - see L</OTHER MERGES>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:164
-msgid ""
-"A suitable interchange branch can be used directly with dgit. In this case "
-"each dgit archive suite branch is a separate interchange branch."
-msgstr ""
-"A suitable interchange branch can be used directly with dgit. In this case "
-"each dgit archive suite branch is a separate interchange branch."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:168
-msgid ""
-"Within the ancestry of the interchange branch, there is another important, "
-"implicit branch, the B<breakwater>. The breakwater contains unmodified "
-"upstream source, but with Debian's packaging superimposed (replacing any "
-"C<debian/> directory that may be in the upstream commits). The breakwater "
-"does not contain any representation of the delta queue (not even debian/"
-"patches). The part of the breakwater processed by git-debrebase is the part "
-"since the most reecent B<anchor>, which is usually a special merge generated "
-"by git-debrebase."
-msgstr ""
-"Within the ancestry of the interchange branch, there is another important, "
-"implicit branch, the B<breakwater>. The breakwater contains unmodified "
-"upstream source, but with Debian's packaging superimposed (replacing any "
-"C<debian/> directory that may be in the upstream commits). The breakwater "
-"does not contain any representation of the delta queue (not even debian/"
-"patches). The part of the breakwater processed by git-debrebase is the part "
-"since the most reecent B<anchor>, which is usually a special merge generated "
-"by git-debrebase."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:181
-msgid ""
-"When working, locally, the user's branch can be in a rebasing state, known "
-"as B<unstitched>. While a branch is unstitched, it is not in interchange "
-"format. The previous interchange branch tip is recorded, so that the "
-"previous history and the user's work can later be stitched into the fast-"
-"forwarding interchange form."
-msgstr ""
-"When working, locally, the user's branch can be in a rebasing state, known "
-"as B<unstitched>. While a branch is unstitched, it is not in interchange "
-"format. The previous interchange branch tip is recorded, so that the "
-"previous history and the user's work can later be stitched into the fast-"
-"forwarding interchange form."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:193
-msgid ""
-"An unstitched branch may be in B<laundered> state, which means it has a more "
-"particular special form convenient for manipulating the delta queue."
-msgstr ""
-"An unstitched branch may be in B<laundered> state, which means it has a more "
-"particular special form convenient for manipulating the delta queue."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:199
-msgid "BRANCH CONTENTS - DETAILED SPECIFICATION"
-msgstr "BRANCH CONTENTS - DETAILED SPECIFICATION"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:201
-msgid ""
-"It is most convenient to describe the B<breakwater> branch first. A "
-"breakwater is B<fast-forwarding>, but is not usually named by a ref. It "
-"contains B<in this order> (ancestors first):"
-msgstr ""
-"It is most convenient to describe the B<breakwater> branch first. A "
-"breakwater is B<fast-forwarding>, but is not usually named by a ref. It "
-"contains B<in this order> (ancestors first):"
-
-#. type: =item
-#: ../git-debrebase.5.pod:210
-msgid "Anchor"
-msgstr "Anchor"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:212
-msgid "An B<anchor> commit, which is usually a special two-parent merge:"
-msgstr "An B<anchor> commit, which is usually a special two-parent merge:"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:215
-msgid ""
-"The first parent contains the most recent version, at that point, of the "
-"Debian packaging (in debian/); it also often contains upstream files, but "
-"they are to be ignored. Often the first parent is a previous breakwater tip."
-msgstr ""
-"The first parent contains the most recent version, at that point, of the "
-"Debian packaging (in debian/); it also often contains upstream files, but "
-"they are to be ignored. Often the first parent is a previous breakwater tip."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:222
-msgid ""
-"The second parent is an upstream source commit. It may sometimes contain a "
-"debian/ subdirectory, but if so that is to be ignored. The second parent's "
-"upstream files are identical to the anchor's. Anchor merges always contain "
-"C<[git-debrebase anchor: ...]> as a line in the commit message."
-msgstr ""
-"The second parent is an upstream source commit. It may sometimes contain a "
-"debian/ subdirectory, but if so that is to be ignored. The second parent's "
-"upstream files are identical to the anchor's. Anchor merges always contain "
-"C<[git-debrebase anchor: ...]> as a line in the commit message."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:232
-msgid ""
-"Alternatively, an anchor may be a single-parent commit which introduces the "
-"C<debian/> directory and makes no other changes: ie, the start of Debian "
-"packaging."
-msgstr ""
-"Alternatively, an anchor may be a single-parent commit which introduces the "
-"C<debian/> directory and makes no other changes: ie, the start of Debian "
-"packaging."
-
-#. type: =item
-#: ../git-debrebase.5.pod:237
-msgid "Packaging"
-msgstr "Packaging"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:239
-msgid ""
-"Zero or more single-parent commits containing only packaging changes. (And "
-"no quilt patch changes.)"
-msgstr ""
-"Zero or more single-parent commits containing only packaging changes. (And "
-"no quilt patch changes.)"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:245
-msgid ""
-"The B<laundered> branch state is B<rebasing>. A laundered branch is based "
-"on a breakwater but also contains, additionally, B<after> the breakwater, a "
-"representation of the delta queue:"
-msgstr ""
-"The B<laundered> branch state is B<rebasing>. A laundered branch is based "
-"on a breakwater but also contains, additionally, B<after> the breakwater, a "
-"representation of the delta queue:"
-
-#. type: =item
-#: ../git-debrebase.5.pod:255
-msgid "Delta queue commits"
-msgstr "Delta queue commits"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:257
-msgid ""
-"Zero or more single-parent commits contaioning only changes to upstream "
-"files."
-msgstr ""
-"Zero or more single-parent commits contaioning only changes to upstream "
-"files."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:262
-msgid ""
-"The merely B<unstitched> (ie, unstitched but unlaundered) branch state is "
-"also B<rebasing>. It has the same contents as the laundered state, except "
-"that it may contain, additionally, in B<in any order but after the "
-"breakwater>:"
-msgstr ""
-"The merely B<unstitched> (ie, unstitched but unlaundered) branch state is "
-"also B<rebasing>. It has the same contents as the laundered state, except "
-"that it may contain, additionally, in B<in any order but after the "
-"breakwater>:"
-
-#. type: =item
-#: ../git-debrebase.5.pod:273
-msgid "Linear commits to the source"
-msgstr "Linear commits to the source"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:275
-msgid ""
-"Further commit(s) containing changes to to upstream files and/or to "
-"packaging, possibly mixed within a single commit. (But not quilt patch "
-"changes.)"
-msgstr ""
-"Further commit(s) containing changes to to upstream files and/or to "
-"packaging, possibly mixed within a single commit. (But not quilt patch "
-"changes.)"
-
-#. type: =item
-#: ../git-debrebase.5.pod:282
-msgid "Quilt patch addition for `3.0 (quilt)'"
-msgstr "Quilt patch addition for `3.0 (quilt)'"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:284
-msgid ""
-"Commit(s) which add patches to B<debian/patches/>, and add those patches to "
-"the end of B<series>."
-msgstr ""
-"Commit(s) which add patches to B<debian/patches/>, and add those patches to "
-"the end of B<series>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:287
-msgid ""
-"These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
-"format. For git-debrebase they are purely an output; they are deleted when "
-"branches are laundered. git-debrebase takes care to make a proper patch "
-"series out of the delta queue, so that any resulting source packages are "
-"nice."
-msgstr ""
-"These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
-"format. For git-debrebase they are purely an output; they are deleted when "
-"branches are laundered. git-debrebase takes care to make a proper patch "
-"series out of the delta queue, so that any resulting source packages are "
-"nice."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:297
-msgid ""
-"Finally, an B<interchange> branch is B<fast forwarding>. It has the same "
-"contents as an unlaundered branch state, but may (and usually will) "
-"additionally contain (in some order, possibly intermixed with the extra "
-"commits which may be found on an unstitched unlaundered branch):"
-msgstr ""
-"Finally, an B<interchange> branch is B<fast forwarding>. It has the same "
-"contents as an unlaundered branch state, but may (and usually will) "
-"additionally contain (in some order, possibly intermixed with the extra "
-"commits which may be found on an unstitched unlaundered branch):"
-
-#. type: =item
-#: ../git-debrebase.5.pod:309
-msgid "Pseudomerge to make fast forward"
-msgstr "Pseudomerge to make fast forward"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:311
-msgid ""
-"A pseudomerge making the branch fast forward from previous history. The "
-"contributing parent is itself in interchange format. Normally the "
-"overwritten parent is a previous tip of an interchange branch, but this is "
-"not necessary as the overwritten parent is not examined."
-msgstr ""
-"A pseudomerge making the branch fast forward from previous history. The "
-"contributing parent is itself in interchange format. Normally the "
-"overwritten parent is a previous tip of an interchange branch, but this is "
-"not necessary as the overwritten parent is not examined."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:319
-msgid ""
-"If the two parents have identical trees, the one with the later commit date "
-"(or, if the commit dates are the same, the first parent) is treated as the "
-"contributing parent."
-msgstr ""
-"If the two parents have identical trees, the one with the later commit date "
-"(or, if the commit dates are the same, the first parent) is treated as the "
-"contributing parent."
-
-#. type: =item
-#: ../git-debrebase.5.pod:326
-msgid "dgit dsc import pseudomerge"
-msgstr "dgit dsc import pseudomerge"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:328
-msgid ""
-"Debian .dsc source package import(s) made by dgit (during dgit fetch of a "
-"package most recently uploaded to Debian without dgit, or during dgit import-"
-"dsc)."
-msgstr ""
-"Debian .dsc source package import(s) made by dgit (during dgit fetch of a "
-"package most recently uploaded to Debian without dgit, or during dgit import-"
-"dsc)."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:334
-msgid ""
-"git-debrebase requires that each such import is in the fast-forwarding "
-"format produced by dgit: a two-parent pseudomerge, whose contributing parent "
-"is in the non-fast-forwarding dgit dsc import format (not described further "
-"here), and whose overwritten parent is the previous interchange tip (eg, the "
-"previous tip of the dgit suite branch)."
-msgstr ""
-"git-debrebase requires that each such import is in the fast-forwarding "
-"format produced by dgit: a two-parent pseudomerge, whose contributing parent "
-"is in the non-fast-forwarding dgit dsc import format (not described further "
-"here), and whose overwritten parent is the previous interchange tip (eg, the "
-"previous tip of the dgit suite branch)."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:347
-msgid "STITCHING, PSEUDO-MERGES, FFQ RECORD"
-msgstr "STITCHING, PSEUDO-MERGES, FFQ RECORD"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:349
-msgid ""
-"Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
-"in the git ref C<refs/ffq-prev/B>."
-msgstr ""
-"Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
-"in the git ref C<refs/ffq-prev/B>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:352
-msgid ""
-"Unstiched branches are not fast forward from the published interchange "
-"branches [1]. So before a branch can be pushed, the right pseudomerge must "
-"be reestablished. This is the stitch operation, which consumes the ffq-prev "
-"ref."
-msgstr ""
-"Unstiched branches are not fast forward from the published interchange "
-"branches [1]. So before a branch can be pushed, the right pseudomerge must "
-"be reestablished. This is the stitch operation, which consumes the ffq-prev "
-"ref."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:359
-msgid ""
-"When the user has an unstitched branch, they may rewrite it freely, from the "
-"breakwater tip onwards. Such a git rebase is the default operation for git-"
-"debrebase. Rebases should not go back before the breakwater tip, and "
-"certainly not before the most recent anchor."
-msgstr ""
-"When the user has an unstitched branch, they may rewrite it freely, from the "
-"breakwater tip onwards. Such a git rebase is the default operation for git-"
-"debrebase. Rebases should not go back before the breakwater tip, and "
-"certainly not before the most recent anchor."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:366
-msgid ""
-"Unstitched branches must not be pushed to interchange branch refs (by the "
-"use of C<git push -f> or equivalent). It is OK to share an unstitched "
-"branch in similar circumstances and with similar warnings to sharing any "
-"other rebasing git branch."
-msgstr ""
-"Unstitched branches must not be pushed to interchange branch refs (by the "
-"use of C<git push -f> or equivalent). It is OK to share an unstitched "
-"branch in similar circumstances and with similar warnings to sharing any "
-"other rebasing git branch."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:372
-msgid ""
-"[1] Strictly, for a package which has never had a Debian delta queue, the "
-"interchange and breakwater branches may be identical, in which case the "
-"unstitched branch is fast forward from the interchange branch and no "
-"pseudomerge is needed."
-msgstr ""
-"[1] Strictly, for a package which has never had a Debian delta queue, the "
-"interchange and breakwater branches may be identical, in which case the "
-"unstitched branch is fast forward from the interchange branch and no "
-"pseudomerge is needed."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:378
-msgid ""
-"When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
-"of refs/B, (usually, the result of last stitch). This is used for status "
-"printing and some error error checks - especially for printing guesses what "
-"a problem is. To determine whether a branch is is being maintained in git-"
-"debrebase form it is necessary to walk its history."
-msgstr ""
-"When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
-"of refs/B, (usually, the result of last stitch). This is used for status "
-"printing and some error error checks - especially for printing guesses what "
-"a problem is. To determine whether a branch is is being maintained in git-"
-"debrebase form it is necessary to walk its history."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:387
-msgid "OTHER MERGES"
-msgstr "OTHER MERGES"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:389
-msgid ""
-"Note that the representation described here does not permit general merges "
-"on any of the relevant branches. For this reason the tools will try to help "
-"the user avoid divergence of the interchange branch."
-msgstr ""
-"Note that the representation described here does not permit general merges "
-"on any of the relevant branches. For this reason the tools will try to help "
-"the user avoid divergence of the interchange branch."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:394
-msgid ""
-"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
-"should be be avoided because they might generate such merges."
-msgstr ""
-"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
-"should be be avoided because they might generate such merges."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:400
-msgid ""
-"Automatic resolution of divergent interchange branches (or laundering of "
-"merges on the interchange branch) is thought to be possible, but there is "
-"no tooling for this yet:"
-msgstr ""
-"Automatic resolution of divergent interchange branches (or laundering of "
-"merges on the interchange branch) is thought to be possible, but there is "
-"no tooling for this yet:"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:405
-msgid ""
-"Nonlinear (merging) history in the interchange branch is awkward because it "
-"(obviously) does not preserve the linearity of the delta queue. Easy "
-"merging of divergent delta queues is a research problem."
-msgstr ""
-"Nonlinear (merging) history in the interchange branch is awkward because it "
-"(obviously) does not preserve the linearity of the delta queue. Easy "
-"merging of divergent delta queues is a research problem."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:410
-msgid ""
-"Nonlinear (merging) history in the breakwater branch is in principle "
-"tolerable, but each of the parents would have to be, in turn, a breakwater, "
-"and difficult questions arise if they don't have the same anchor."
-msgstr ""
-"Nonlinear (merging) history in the breakwater branch is in principle "
-"tolerable, but each of the parents would have to be, in turn, a breakwater, "
-"and difficult questions arise if they don't have the same anchor."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:416
-msgid ""
-"We use the commit message annotation to distinguish the special anchor "
-"merges from other general merges, so we can at least detect unsupported "
-"merges."
-msgstr ""
-"We use the commit message annotation to distinguish the special anchor "
-"merges from other general merges, so we can at least detect unsupported "
-"merges."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:420
-msgid "LEGAL OPERATIONS"
-msgstr "LEGAL OPERATIONS"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:422
-msgid ""
-"The following basic operations follows from this model (refer to the diagram "
-"above):"
-msgstr ""
-"The following basic operations follows from this model (refer to the diagram "
-"above):"
-
-#. type: =item
-#: ../git-debrebase.5.pod:427
-msgid "Append linear commits"
-msgstr "Append linear commits"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:429
-msgid ""
-"No matter the branch state, it is always fine to simply git commit (or "
-"cherry-pick etc.) commits containing upstream file changes, packaging "
-"changes, or both."
-msgstr ""
-"No matter the branch state, it is always fine to simply git commit (or "
-"cherry-pick etc.) commits containing upstream file changes, packaging "
-"changes, or both."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:435
-msgid "(This may make the branch unlaundered.)"
-msgstr "(This may make the branch unlaundered.)"
-
-#. type: =item
-#: ../git-debrebase.5.pod:437
-msgid "Launder branch"
-msgstr "Launder branch"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:439
-msgid ""
-"Record the previous head in ffq-prev, if we were stitched before (and delete "
-"debrebase-last)."
-msgstr ""
-"Record the previous head in ffq-prev, if we were stitched before (and delete "
-"debrebase-last)."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:443
-msgid ""
-"Reorganise the current branch so that the packaging changes come first, "
-"followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
-msgstr ""
-"Reorganize the current branch so that the packaging changes come first, "
-"followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:448
-msgid "Drop pseudomerges and any quilt patch additions."
-msgstr "Drop pseudomerges and any quilt patch additions."
-
-#. type: =item
-#: ../git-debrebase.5.pod:450
-msgid "Interactive rebase"
-msgstr "Interactive rebase"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:452
-msgid ""
-"With a laundered branch, one can do an interactive git rebase of the delta "
-"queue."
-msgstr ""
-"With a laundered branch, one can do an interactive git rebase of the delta "
-"queue."
-
-#. type: =item
-#: ../git-debrebase.5.pod:455
-msgid "New upstream rebase"
-msgstr "New upstream rebase"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:457
-msgid ""
-"Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
-"into C<(...#..@-A-B-, ...#'-)@'-1-2>."
-msgstr ""
-"Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
-"into C<(...#..@-A-B-, ...#'-)@'-1-2>."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:460
-msgid ""
-"This has to be a wrapper around git-rebase, which prepares @' and then tries "
-"to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' "
-"doesn't appear in the commit list, since @' is the newbase of the rebase "
-"(see git-rebase(1))."
-msgstr ""
-"This has to be a wrapper around git-rebase, which prepares @' and then tries "
-"to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' "
-"doesn't appear in the commit list, since @' is the newbase of the rebase "
-"(see git-rebase(1))."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:466
-msgid ""
-"Note that the construction of @' cannot fail because @' simply copies "
-"debian/ from B and and everything else from #'. (Rebasing A and B is "
-"undesirable. We want the debian/ files to be non-rebasing so that git log "
-"shows the packaging history.)"
-msgstr ""
-"Note that the construction of @' cannot fail because @' simply copies "
-"debian/ from B and and everything else from #'. (Rebasing A and B is "
-"undesirable. We want the debian/ files to be non-rebasing so that git log "
-"shows the packaging history.)"
-
-#. type: =item
-#: ../git-debrebase.5.pod:472
-msgid "Stitch"
-msgstr "Stitch"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:474
-msgid ""
-"Make a pseudomerge, whose contributing parent to is the unstitched branch "
-"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
-"(and writing debrebase-last instead). Ideally the contributing parent would "
-"be a laundered branch, or perhaps a laundered branch with a quilt patch "
-"addition commit."
-msgstr ""
-"Make a pseudomerge, whose contributing parent to is the unstitched branch "
-"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
-"(and writing debrebase-last instead). Ideally the contributing parent would "
-"be a laundered branch, or perhaps a laundered branch with a quilt patch "
-"addition commit."
-
-#. type: =item
-#: ../git-debrebase.5.pod:483
-msgid "Commit quilt patches"
-msgstr "Commit quilt patches"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:485
-msgid ""
-"To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
-"packages, the delta queue must be reified inside the git tree in B<debian/"
-"patches/>. These patch files can be stripped out and/or regenerated as "
-"needed."
-msgstr ""
-"To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
-"packages, the delta queue must be reified inside the git tree in B<debian/"
-"patches/>. These patch files can be stripped out and/or regenerated as "
-"needed."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:493
-msgid "ILLEGAL OPERATIONS"
-msgstr "ILLEGAL OPERATIONS"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:495
-msgid ""
-"Some git operations are not permitted in this data model. Performing them "
-"will break git-debrebase."
-msgstr ""
-"Some git operations are not permitted in this data model. Performing them "
-"will break git-debrebase."
-
-#. type: =item
-#: ../git-debrebase.5.pod:500
-msgid "General merges"
-msgstr "General merges"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:502
-msgid "See L</OTHER MERGES>, above."
-msgstr "See L</OTHER MERGES>, above."
-
-#. type: =item
-#: ../git-debrebase.5.pod:504
-msgid "git-rebase starting too soon, or without base argument"
-msgstr "git-rebase starting too soon, or without base argument"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:506
-msgid ""
-"git-rebase must not be invoked in such a way that the chosen base is before "
-"the anchor, or before the last pseudomerge. This is because git-rebase "
-"mangles merges. git rebase --preserve-merges is also dangerous."
-msgstr ""
-"git-rebase must not be invoked in such a way that the chosen base is before "
-"the anchor, or before the last pseudomerge. This is because git-rebase "
-"mangles merges. git rebase --preserve-merges is also dangerous."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:512
-msgid "git-rebase without a base argument will often start too early."
-msgstr "git-rebase without a base argument will often start too early."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:514
-msgid ""
-"For these reasons, it is better to use git-debrebase and let it choose the "
-"base for your rebase. If you do realise you have make this mistake, it is "
-"best to use the reflog to recover to a suitable good previous state."
-msgstr ""
-"For these reasons, it is better to use git-debrebase and let it choose the "
-"base for your rebase. If you do realise you have make this mistake, it is "
-"best to use the reflog to recover to a suitable good previous state."
-
-#. type: =item
-#: ../git-debrebase.5.pod:522
-msgid "Editing debian/patches"
-msgstr "Editing debian/patches"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:524
-msgid ""
-"debian/patches is an output from git-debrebase, not an input. If you edit "
-"patches git-debrebase will complain and refuse to work. If you add patches "
-"your work is likely to be discarded."
-msgstr ""
-"debian/patches is an output from git-debrebase, not an input. If you edit "
-"patches git-debrebase will complain and refuse to work. If you add patches "
-"your work is likely to be discarded."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:530
-msgid ""
-"Instead of editing patches, use git-debrebase to edit the corresponding "
-"commits."
-msgstr ""
-"Instead of editing patches, use git-debrebase to edit the corresponding "
-"commits."
-
-#. type: =item
-#: ../git-debrebase.5.pod:533
-msgid "Renaming (etc.) branch while unstitched"
-msgstr "Renaming (etc.) branch while unstitched"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:535
-msgid ""
-"The previous HEAD, which will be pseudomerged over by operations like git-"
-"debrebase stitch, is recorded in a ref name dervied from your branch name."
-msgstr ""
-"The previous HEAD, which will be pseudomerged over by operations like git-"
-"debrebase stitch, is recorded in a ref name dervied from your branch name."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:540
-msgid ""
-"If you rename unstitched branches, this information can get out of step."
-msgstr ""
-"If you rename unstitched branches, this information can get out of step."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:543
-msgid ""
-"Conversely, creating a new branch from an unstitched branch is good for "
-"making a branch to play about in, but the result cannot be stitched."
-msgstr ""
-"Conversely, creating a new branch from an unstitched branch is good for "
-"making a branch to play about in, but the result cannot be stitched."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:550
-msgid "COMMIT MESSAGE ANNOTATIONS"
-msgstr "COMMIT MESSAGE ANNOTATIONS"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:552
-msgid ""
-"git-debrebase makes annotations in the messages of commits it generates."
-msgstr ""
-"git-debrebase makes annotations in the messages of commits it generates."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:555
-msgid "The general form is"
-msgstr "The general form is"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:557
-#, no-wrap
-msgid ""
-" [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
-"\n"
-msgstr ""
-" [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
-"\n"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:559
-msgid ""
-"git-debrebase treats anything after the colon as a comment, paying no "
-"attention to PROSE."
-msgstr ""
-"git-debrebase treats anything after the colon as a comment, paying no "
-"attention to PROSE."
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:562
-#, no-wrap
-msgid ""
-"The full set of annotations is:\n"
-" [git-debrebase split: mixed commit, debian part]\n"
-" [git-debrebase split: mixed commit, upstream-part]\n"
-" [git-debrebase onvert dgit import: debian changes]\n"
-" [git-debrebase anchor: convert dgit import, upstream changes]\n"
-"\n"
-msgstr ""
-"The full set of annotations is:\n"
-" [git-debrebase split: mixed commit, debian part]\n"
-" [git-debrebase split: mixed commit, upstream-part]\n"
-" [git-debrebase onvert dgit import: debian changes]\n"
-" [git-debrebase anchor: convert dgit import, upstream changes]\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:568
-#, no-wrap
-msgid ""
-" [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
-" [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
-" [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
-" [git-debrebase make-patches: export and commit patches]\n"
-"\n"
-msgstr ""
-" [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
-" [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
-" [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
-" [git-debrebase make-patches: export and commit patches]\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:573
-#, no-wrap
-msgid ""
-" [git-debrebase convert-from-gbp: drop patches]\n"
-" [git-debrebase anchor: declare upstream]\n"
-" [git-debrebase pseudomerge: stitch]\n"
-"\n"
-msgstr ""
-" [git-debrebase convert-from-gbp: drop patches]\n"
-" [git-debrebase anchor: declare upstream]\n"
-" [git-debrebase pseudomerge: stitch]\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:577
-#, no-wrap
-msgid ""
-" [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
-"\n"
-msgstr ""
-" [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:579
-#, no-wrap
-msgid ""
-" [git-debrebase convert-to-gbp: commit patches]\n"
-" [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
-" [git-debrebase convert-from-dgit-view drop-patches]\n"
-"\n"
-msgstr ""
-" [git-debrebase convert-to-gbp: commit patches]\n"
-" [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
-" [git-debrebase convert-from-dgit-view drop-patches]\n"
-"\n"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:583
-msgid ""
-"Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-"
-"parent anchors are not generated by git-debrebase, and when made manually "
-"should not contain any C<[git-debrebase ...]> annotation."
-msgstr ""
-"Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-"
-"parent anchors are not generated by git-debrebase, and when made manually "
-"should not contain any C<[git-debrebase ...]> annotation."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:588
-msgid ""
-"The C<split mixed commit> and C<convert dgit import> tags are added to the "
-"pre-existing commit message, when git-debrebase rewrites the commit."
-msgstr ""
-"The C<split mixed commit> and C<convert dgit import> tags are added to the "
-"pre-existing commit message, when git-debrebase rewrites the commit."
-
-#. type: =head1
-#: ../git-debrebase.5.pod:592
-msgid "APPENDIX - DGIT IMPORT HANDLING"
-msgstr "APPENDIX - DGIT IMPORT HANDLING"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:594
-msgid ""
-"The dgit .dsc import format is not documented or specified (so some of the "
-"following terms are not defined anywhere). The dgit import format it is "
-"defined by the implementation in dgit, of which git-debrebase has special "
-"knowledge."
-msgstr ""
-"The dgit .dsc import format is not documented or specified (so some of the "
-"following terms are not defined anywhere). The dgit import format it is "
-"defined by the implementation in dgit, of which git-debrebase has special "
-"knowledge."
-
-#. type: textblock
-#: ../git-debrebase.5.pod:599
-msgid "Consider a non-dgit NMU followed by a dgit NMU:"
-msgstr "Consider a non-dgit NMU followed by a dgit NMU:"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:601
-#, no-wrap
-msgid ""
-" interchange --/--B3!--%--//----D*-->\n"
-" / /\n"
-" % 4\n"
-" / 3\n"
-" / 2\n"
-" / 1\n"
-" 2 &_\n"
-" / /| \\\n"
-" 1 0 00 =XBC%\n"
-" /\n"
-" /\n"
-" --@--A breakwater\n"
-" /\n"
-" --#--------> upstream\n"
-"\n"
-msgstr ""
-" interchange --/--B3!--%--//----D*-->\n"
-" / /\n"
-" % 4\n"
-" / 3\n"
-" / 2\n"
-" / 1\n"
-" 2 &_\n"
-" / /| \\\n"
-" 1 0 00 =XBC%\n"
-" /\n"
-" /\n"
-" --@--A breakwater\n"
-" /\n"
-" --#--------> upstream\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:617
-#, no-wrap
-msgid ""
-" Supplementary key:\n"
-"\n"
-msgstr ""
-" Supplementary key:\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:619
-#, no-wrap
-msgid ""
-" =XBC% dgit tarball import of .debian.tar.gz containing\n"
-" Debian packaging including changes B C and quilt patches\n"
-" 0 dgit tarball import of upstream tarball\n"
-" 00 dgit tarball import of supplementary upstream piece\n"
-" &_ dgit import nearly-breakwater-anchor\n"
-" // dgit fetch / import-dsc pseudomerge to make fast forward\n"
-"\n"
-msgstr ""
-" =XBC% dgit tarball import of .debian.tar.gz containing\n"
-" Debian packaging including changes B C and quilt patches\n"
-" 0 dgit tarball import of upstream tarball\n"
-" 00 dgit tarball import of supplementary upstream piece\n"
-" &_ dgit import nearly-breakwater-anchor\n"
-" // dgit fetch / import-dsc pseudomerge to make fast forward\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:626
-#, no-wrap
-msgid ""
-" &' git-debrebase converted import (upstream files only)\n"
-" C' git-debrebase converted packaging change import\n"
-"\n"
-msgstr ""
-" &' git-debrebase converted import (upstream files only)\n"
-" C' git-debrebase converted packaging change import\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:629
-#, no-wrap
-msgid ""
-" * ** before and after HEAD\n"
-"\n"
-msgstr ""
-" * ** before and after HEAD\n"
-"\n"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:631
-msgid "We want to transform this into:"
-msgstr "We want to transform this into:"
-
-#. type: =item
-#: ../git-debrebase.5.pod:635
-msgid "I. No new upstream version"
-msgstr "I. No new upstream version"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:637
-#, no-wrap
-msgid ""
-" (0 + 00 eq #)\n"
-" --/--B3!--%--//-----D*-------------/-->\n"
-" / / /\n"
-" % 4 4**\n"
-" / 3 3\n"
-" / 2 2\n"
-" / 1 1\n"
-" 2 &_ /\n"
-" / /| \\ /\n"
-" 1 0 00 =XBC% /\n"
-" / /\n"
-" / /\n"
-" --@--A-----B---------------------C'---D\n"
-" /\n"
-" --#----------------------------------------->\n"
-"\n"
-msgstr ""
-" (0 + 00 eq #)\n"
-" --/--B3!--%--//-----D*-------------/-->\n"
-" / / /\n"
-" % 4 4**\n"
-" / 3 3\n"
-" / 2 2\n"
-" / 1 1\n"
-" 2 &_ /\n"
-" / /| \\ /\n"
-" 1 0 00 =XBC% /\n"
-" / /\n"
-" / /\n"
-" --@--A-----B---------------------C'---D\n"
-" /\n"
-" --#----------------------------------------->\n"
-"\n"
-
-#. type: =item
-#: ../git-debrebase.5.pod:653
-msgid "II. New upstream"
-msgstr "II. New upstream"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:655
-#, no-wrap
-msgid ""
-" (0 + 00 neq #)\n"
-"\n"
-msgstr ""
-" (0 + 00 neq #)\n"
-"\n"
-
-#. type: verbatim
-#: ../git-debrebase.5.pod:657
-#, no-wrap
-msgid ""
-" --/--B3!--%--//-----D*-------------/-->\n"
-" / / /\n"
-" % 4 4**\n"
-" / 3 3\n"
-" / 2 2\n"
-" / 1 1\n"
-" 2 &_ /\n"
-" / /| \\ /\n"
-" 1 0 00 =XBC% /\n"
-" / /\n"
-" / /\n"
-" --@--A-----B-----------------@---C'---D\n"
-" / /\n"
-" --#--------------------- - - / - - --------->\n"
-" /\n"
-" &'\n"
-" /|\n"
-" 0 00\n"
-"\n"
-msgstr ""
-" --/--B3!--%--//-----D*-------------/-->\n"
-" / / /\n"
-" % 4 4**\n"
-" / 3 3\n"
-" / 2 2\n"
-" / 1 1\n"
-" 2 &_ /\n"
-" / /| \\ /\n"
-" 1 0 00 =XBC% /\n"
-" / /\n"
-" / /\n"
-" --@--A-----B-----------------@---C'---D\n"
-" / /\n"
-" --#--------------------- - - / - - --------->\n"
-" /\n"
-" &'\n"
-" /|\n"
-" 0 00\n"
-"\n"
-
-#. type: textblock
-#: ../git-debrebase.5.pod:680
-msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"
-msgstr "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"