X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=po4a%2Fdgit-maint-native_7.pot;h=43d7d518fb93cf8d877d316fe3e47b1588ad4f4c;hb=680bc93a530e53a0f91dc732244f710387ca16eb;hp=da226810e540eb23a3a5bc8b7fb5081e5d0f21c0;hpb=16b6da7ef6e12a6afd2b7a2df76e8f87dbc6aa60;p=dgit.git diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index da226810..43d7d518 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_7.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 \n" "Language-Team: LANGUAGE \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" @@ -163,7 +163,7 @@ msgstr "" #: ../dgit-maint-native.7.pod:85 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " -"avoid this merge commit by passing C<--deliberately-not-fast-forward>. " +"avoid this merge commit by passing C<--deliberately-not-fast-forward> " "instead of C<--overwrite>. This avoids introducing a new origin commit into " "your git history." msgstr ""