msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-08-10 19:42+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"
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1555 ../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
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:254
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
-#. 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."
+#. type: =head1
+#: ../dgit-maint-bpo.7.pod:11 ../git-debrebase.5.pod:37
+msgid "TERMINOLOGY"
msgstr ""
#. type: textblock
msgid "git-debrebase - git data model for Debian packaging"
msgstr ""
+#. type: textblock
+#: ../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 ""
+
#. type: textblock
#: ../git-debrebase.5.pod:11
msgid ""
"output than the default."
msgstr ""
-#. type: =head1
-#: ../git-debrebase.5.pod:37
-msgid "TERMINOLOGY"
-msgstr ""
-
#. type: =item
#: ../git-debrebase.5.pod:41
msgid "Pseudomerge"
#: ../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 "
+"branch is found on Debian contributors' 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)."
"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 re
ecent B<anchor>, which is usually a special merge generated "
+"since the most recent B<anchor>, which is usually a special merge generated "
"by git-debrebase."
msgstr ""
#. type: textblock
#: ../git-debrebase.5.pod:257
msgid ""
-"Zero or more single-parent commits contaioning only changes to upstream "
-"files."
+"Zero or more single-parent commits containing only changes to upstream files."
msgstr ""
#. type: textblock
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>:"
+"that it may contain, additionally, B<in any order but after the breakwater>:"
msgstr ""
#. type: =item
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-"
+"printing and some error error checks - especially for printing guesses about "
+"what a problem is. To determine whether a branch is being maintained in git-"
"debrebase form it is necessary to walk its history."
msgstr ""
#. type: textblock
#: ../git-debrebase.5.pod:394
msgid ""
-"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
+"See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours "
"should be be avoided because they might generate such merges."
msgstr ""
#. type: textblock
#: ../git-debrebase.5.pod:422
msgid ""
-"The following basic operations follows from this model (refer to the diagram "
+"The following basic operations follow from this model (refer to the diagram "
"above):"
msgstr ""
#. 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."
+"Make a pseudomerge, whose contributing parent 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 ""
#. type: =item
#: ../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/"
+"package, 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 ""
#: ../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 "
+"base for your rebase. If you do realise you have made this mistake, it is "
"best to use the reflog to recover to a suitable good previous state."
msgstr ""
~ianmdlvl / dgit.git / blobdiff