summaryrefslogtreecommitdiffstats
path: root/po/quilt.pot
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-08-22 21:37:36 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-08-22 21:37:36 +0000
commitbac9d82b5bcaedf1c5fac692d8ce7e8628d2d31c (patch)
treed01eab125aa4e9ae0fa2f20771380d2c053e480a /po/quilt.pot
parent651391cebe1b5ed1913f4d2260ec6abe31aa6b21 (diff)
downloadquilt-bac9d82b5bcaedf1c5fac692d8ce7e8628d2d31c.tar.gz
- quilt/fold.in: fold did not work when invoked from a
subdirectory; update test case.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r--po/quilt.pot19
1 files changed, 10 insertions, 9 deletions
diff --git a/po/quilt.pot b/po/quilt.pot
index 3b85f74..34df47c 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -283,7 +283,7 @@ msgid ""
"\twhen applying patchfile.\n"
msgstr ""
-#: quilt/fold.in:116
+#: quilt/fold.in:117
msgid "File %s may be corrupted\\n"
msgstr ""
@@ -413,7 +413,8 @@ msgstr ""
#: quilt/import.in:25
msgid ""
"\n"
-"Import external patches.\n"
+"Import external patches. The patches will be inserted following the\n"
+"current top patch, and must be pushed after import to apply them.\n"
"\n"
"-p num\n"
"\tNumber of directory levels to strip when applying (default=1)\n"
@@ -425,31 +426,31 @@ msgid ""
"-f\tOverwite/update existing patches.\n"
msgstr ""
-#: quilt/import.in:74
+#: quilt/import.in:75
msgid "Option \\`-n' can only be used when importing a single patch\\n"
msgstr ""
-#: quilt/import.in:92
+#: quilt/import.in:93
msgid "Patch %s is applied\\n"
msgstr ""
-#: quilt/import.in:100
+#: quilt/import.in:101
msgid "Patch %s exists. Replace with -f.\\n"
msgstr ""
-#: quilt/import.in:104
+#: quilt/import.in:105
msgid "Replacing patch %s with new version\\n"
msgstr ""
-#: quilt/import.in:107
+#: quilt/import.in:108
msgid "Importing patch %s (stored as %s)\\n"
msgstr ""
-#: quilt/import.in:115
+#: quilt/import.in:116
msgid "Failed to import patch %s\\n"
msgstr ""
-#: quilt/import.in:122
+#: quilt/import.in:123
msgid "Failed to insert patch %s into file series\\n"
msgstr ""