diff options
Diffstat (limited to 'po4a/git-debrebase_5.pot')
| -rw-r--r-- | po4a/git-debrebase_5.pot | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index f5c7df7..71601b1 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.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: 2019-03-01 16:59+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,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../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 +#: ../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" @@ -312,7 +312,7 @@ msgstr "" #: ../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)." @@ -349,7 +349,7 @@ msgid "" "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 " +"since the most recent B<anchor>, which is usually a special merge generated " "by git-debrebase." msgstr "" @@ -446,8 +446,7 @@ 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 @@ -455,8 +454,7 @@ msgstr "" 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 @@ -601,8 +599,8 @@ msgstr "" 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 "" @@ -666,7 +664,7 @@ 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 "" @@ -762,11 +760,11 @@ 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 @@ -778,7 +776,7 @@ msgstr "" #: ../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 "" @@ -827,7 +825,7 @@ 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 "" |