summaryrefslogtreecommitdiffstats
path: root/po/quilt.pot
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-06-10 20:08:37 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-06-10 20:08:37 +0000
commit71d64f6c066574e47dfc0363efc576dd21474f8e (patch)
treefba3c6f2e10b661c208d0c06d32c4b2ad4ced93b /po/quilt.pot
parent27a5cb45dd2f3fa87f295fb3c5de91de96ba3a7b (diff)
downloadquilt-71d64f6c066574e47dfc0363efc576dd21474f8e.tar.gz
- Add meta-data version check/upgrade code from Martin Quinson and
me; new `quilt upgrade' command. - Handle new/removed files correctly in generated patches: If the old or new file is missing, the file name in the patch should be /dev/null. Fix test suite accordingly, and add test/create-delete.diff. GNU patch recognizes this, and does additional file existance tests when a patch creates/deletes a file. Also use the --label option of GNU diff instead of hand-editing file name headers. - Add test/Makefile for running the test suite. Note: The tests run against the installed version of quilt! - Bump version to 0.34.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r--po/quilt.pot61
1 files changed, 56 insertions, 5 deletions
diff --git a/po/quilt.pot b/po/quilt.pot
index 8b23e7d..dc6aa3f 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -46,7 +46,7 @@ msgstr ""
#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:168
#: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64
-#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:214
+#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215
#: ../quilt/refresh.in:107 ../quilt/remove.in:80
msgid "No patches applied"
msgstr ""
@@ -342,11 +342,11 @@ msgstr ""
msgid "Patch $patch exists already"
msgstr ""
-#: ../quilt/new.in:80
+#: ../quilt/new.in:81
msgid "Failed to create patch $patch"
msgstr ""
-#: ../quilt/new.in:83
+#: ../quilt/new.in:84
msgid "Patch $patch is now on top"
msgstr ""
@@ -413,11 +413,11 @@ msgstr ""
msgid "No patch removed"
msgstr ""
-#: ../quilt/pop.in:172 ../quilt/push.in:205
+#: ../quilt/pop.in:172 ../quilt/push.in:206
msgid "Interrupted by user"
msgstr ""
-#: ../quilt/pop.in:188 ../quilt/push.in:216
+#: ../quilt/pop.in:188 ../quilt/push.in:217
msgid "Now at patch $patch"
msgstr ""
@@ -641,6 +641,43 @@ msgid ""
"-n\tPrint patch file names instead of patch names."
msgstr ""
+#: ../quilt/upgrade.in:25
+msgid "Usage: quilt upgrade"
+msgstr ""
+
+#: ../quilt/upgrade.in:28
+msgid ""
+"\n"
+"Upgrade the meta-data in a working tree from an old version of quilt to the\n"
+"current version. This command is only needed when the quilt meta-data "
+"format\n"
+"has changed, and the working tree still contains old-format meta-data. In "
+"that\n"
+"case, quilt will request to run \\`quilt upgrade'."
+msgstr ""
+
+#: ../quilt/upgrade.in:66
+msgid ""
+"The quilt meta-data in $QUILT_PC/ already are have format version "
+"$DB_VERSION; nothing to do"
+msgstr ""
+
+#: ../quilt/upgrade.in:70
+msgid "Converting meta-data to version $DB_VERSION"
+msgstr ""
+
+#: ../quilt/upgrade.in:101
+msgid "Conversion failed"
+msgstr ""
+
+#: ../quilt/upgrade.in:102
+msgid ""
+"\n"
+"Please remove all patches using \\`quilt pop -a' from the quilt version used "
+"to create this working tree, or remove the $QUILT_PC directory and apply the "
+"patches from scratch."
+msgstr ""
+
#: ../scripts/apatch.in:22
msgid "Usage: $0 [-fqv] patchname"
msgstr ""
@@ -673,6 +710,20 @@ msgstr ""
msgid "The topmost patch $top needs to be refreshed first."
msgstr ""
+#: ../scripts/patchfns.in:691
+msgid ""
+"The quilt meta-data in this tree has version $version, but this version of "
+"quilt can only handle meta-data formats up to and including version "
+"$DB_VERSION. Please pop all the patches using the version of quilt used to "
+"push them before downgrading."
+msgstr ""
+
+#: ../scripts/patchfns.in:753
+msgid ""
+"The working tree was created by an older version of quilt. Please run 'quilt "
+"upgrade'."
+msgstr ""
+
#: ../scripts/rpatch.in:22
msgid "Usage: $0 [-fRq] patchname"
msgstr ""