summaryrefslogtreecommitdiffstats
path: root/po/quilt.pot
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-02-16 20:16:58 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-02-16 20:16:58 +0000
commit867131b0791c4276cfdd273c20c3136ab63557f3 (patch)
tree1cc8c29e66126becc5457c48cd434d11424a4be6 /po/quilt.pot
parent114573d37141d67fbfe8dec85169142cbc14a1e1 (diff)
downloadquilt-867131b0791c4276cfdd273c20c3136ab63557f3.tar.gz
Merge version of James's temp file patch (some further improvements,
hopefully). Also, fix some messages that seem to have been reset to a previous version during I18N, and update the test script.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r--po/quilt.pot4
1 files changed, 2 insertions, 2 deletions
diff --git a/po/quilt.pot b/po/quilt.pot
index b96bc84..fef8c38 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -171,7 +171,7 @@ msgid "Diff failed, aborting."
msgstr ""
#: ../quilt/diff.in:305
-msgid "More recent patches modify the same files."
+msgid "More recent patches modify files in $last_patch."
msgstr ""
#: ../quilt/files.in:22
@@ -469,7 +469,7 @@ msgid ""
msgstr ""
#: ../quilt/refresh.in:150
-msgid "More recent patches modify the same files. Enforce refresh with -f."
+msgid "More recent patches modify files in $patch. Enforce refresh with -f."
msgstr ""
#: ../quilt/refresh.in:157