summaryrefslogtreecommitdiff
path: root/po4a/dgit-maint-debrebase_7.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po4a/dgit-maint-debrebase_7.pot')
-rw-r--r--po4a/dgit-maint-debrebase_7.pot12
1 files changed, 6 insertions, 6 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot
index b937feb..71969f4 100644
--- a/po4a/dgit-maint-debrebase_7.pot
+++ b/po4a/dgit-maint-debrebase_7.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"
@@ -27,7 +27,7 @@ msgid "NAME"
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
@@ -695,8 +695,8 @@ msgstr ""
#: ../dgit-maint-debrebase.7.pod:378
msgid ""
"Pass I<--stat> just to see the list of changed files, which is useful to "
-"determine whether there are any new or deleted files to may need accounting "
-"for in your copyright file."
+"determine whether there are any new or deleted files that may need "
+"accounting for in your copyright file."
msgstr ""
#. type: =head1
@@ -815,7 +815,7 @@ msgid ""
"last upload, it is not possible for dgit to make your history fast-"
"forwarding from the history on B<dgit-repos>. In such cases you will have "
"to pass I<--overwrite> to dgit. git-debrebase will normally tell you if "
-"this is will be needed."
+"this will be needed."
msgstr ""
#. type: textblock
@@ -983,7 +983,7 @@ msgstr ""
#. type: textblock
#: ../dgit-maint-debrebase.7.pod:562
msgid ""
-"If that fails, because your branch and the NMUers work represent divergent "
+"If that fails, because your branch and the NMUers' work represent divergent "
"branches of development, you have a number of options. Here we describe the "
"two simplest."
msgstr ""