summaryrefslogtreecommitdiffstats
path: root/po/quilt.pot
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-01-23 05:01:00 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-01-23 05:01:00 +0000
commit0ae231e732db3af8de72ec7c846ed72a7f9c9fd3 (patch)
tree4e677efe26a93898d32a0f1741163f2dd39d312d /po/quilt.pot
parentcaf1482275106e47eefe58669156def40acadae3 (diff)
downloadquilt-0ae231e732db3af8de72ec7c846ed72a7f9c9fd3.tar.gz
- Add mail command, doc/README.MAIL and example ``mail'' command
filter in quilt.quiltrc. - Bump version to 0.38.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r--po/quilt.pot37
1 files changed, 19 insertions, 18 deletions
diff --git a/po/quilt.pot b/po/quilt.pot
index f2e0a53..3e586df 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1,12 +1,12 @@
-#: ../bin/quilt.in:20
+#: ../bin/quilt.in:23
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr ""
-#: ../bin/quilt.in:22
+#: ../bin/quilt.in:25
msgid "Commands are:"
msgstr ""
-#: ../bin/quilt.in:27
+#: ../bin/quilt.in:30
msgid ""
"\n"
"Common options to all commands:\n"
@@ -15,8 +15,9 @@ msgid ""
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
"\n"
"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc. \n"
-"\tSee pdf documentation for details about its possible content."
+"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
+"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n"
+"\tdocumentation for details about its possible content."
msgstr ""
#: ../quilt/add.in:22
@@ -36,7 +37,7 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr ""
@@ -48,7 +49,7 @@ msgstr ""
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143
+#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143
#: ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr ""
@@ -417,7 +418,7 @@ msgstr ""
msgid "No patch removed\\n"
msgstr ""
-#: ../quilt/pop.in:293 ../quilt/push.in:321
+#: ../quilt/pop.in:293 ../quilt/push.in:328
msgid "Now at patch %s\\n"
msgstr ""
@@ -472,35 +473,35 @@ msgstr ""
msgid "Patch %s appears to be empty\\n"
msgstr ""
-#: ../quilt/push.in:109
+#: ../quilt/push.in:135
msgid "Applying patch %s\\n"
msgstr ""
-#: ../quilt/push.in:159
+#: ../quilt/push.in:166
msgid "Patch %s appears to be empty, applied\\n"
msgstr ""
-#: ../quilt/push.in:163
+#: ../quilt/push.in:170
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
-#: ../quilt/push.in:168
+#: ../quilt/push.in:175
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
-#: ../quilt/push.in:207
+#: ../quilt/push.in:214
msgid "Patch %s not found in file series\\n"
msgstr ""
-#: ../quilt/push.in:282
+#: ../quilt/push.in:289
msgid "Patch %s is already applied\\n"
msgstr ""
-#: ../quilt/push.in:291
+#: ../quilt/push.in:298
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr ""
-#: ../quilt/push.in:305
+#: ../quilt/push.in:312
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
@@ -712,7 +713,7 @@ msgid ""
"patches from scratch.\\n"
msgstr ""
-#: ../scripts/patchfns.in:703
+#: ../scripts/patchfns.in:750
msgid ""
"The quilt meta-data in this tree has version %s, but this version of quilt "
"can only handle meta-data formats up to and including version %s. Please pop "
@@ -720,7 +721,7 @@ msgid ""
"downgrading.\\n"
msgstr ""
-#: ../scripts/patchfns.in:770
+#: ../scripts/patchfns.in:817
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"