summaryrefslogtreecommitdiff
path: root/po4a/git-debrebase_1.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po4a/git-debrebase_1.pot')
-rw-r--r--po4a/git-debrebase_1.pot16
1 files changed, 8 insertions, 8 deletions
diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot
index 630039b..0697082 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: 2019-01-06 17:50+0000\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"
@@ -33,7 +33,7 @@ msgid "OPTIONS"
msgstr ""
#. type: =head1
-#: ../dgit.1:1469 ../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:747 ../dgit-downstream-dsc.7.pod:352
@@ -88,7 +88,7 @@ msgstr ""
#. type: textblock
#: ../git-debrebase.1.pod:22
msgid ""
-"You should read this manpage in cojnunction with L<git-debrebase(5)/"
+"You should read this manpage in conjunction with L<git-debrebase(5)/"
"TERMINOLOGY>, which defines many important terms used here."
msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
msgid ""
"It is hazardous to use plain git-rebase on a git-debrebase branch, because "
"git-rebase has a tendency to start the rebase too far back in history, and "
-"then drop important commits. Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>"
+"then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>"
msgstr ""
#. type: =item
@@ -325,7 +325,7 @@ msgstr ""
#. type: textblock
#: ../git-debrebase.1.pod:157
msgid ""
-"<new-version> may be whole new Debian version, including revision, or just "
+"<new-version> may be a whole new Debian version, including revision, or just "
"the upstream part, in which case -1 will be appended to make the new Debian "
"version."
msgstr ""
@@ -461,7 +461,7 @@ msgstr ""
msgid ""
"If the patches implied by the current branch are not a simple superset of "
"those already in debian/patches, make-patches will fail with exit status 7, "
-"and an error message. (The message can be suppress with --quiet-would-"
+"and an error message. (The message can be suppressed with --quiet-would-"
"amend.) If the problem is simply that the existing patches were not made by "
"git-debrebase, using dgit quilt-fixup instead should succeed."
msgstr ""
@@ -478,7 +478,7 @@ msgstr ""
#. type: textblock
#: ../git-debrebase.1.pod:261
-msgid "Cnnverts any of the following into a git-debrebase interchange branch:"
+msgid "Converts any of the following into a git-debrebase interchange branch:"
msgstr ""
#. type: textblock
@@ -651,7 +651,7 @@ msgstr ""
#: ../git-debrebase.1.pod:371
msgid ""
"This is provided mostly for the test suite and for unusual situations. It "
-"should only be used with a care and with a proper understanding of the "
+"should only be used with care and with a proper understanding of the "
"underlying theory."
msgstr ""