diff options
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 82 |
1 files changed, 45 insertions, 37 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 33da106..940843b 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,16 +1,16 @@ -#: bin/quilt.in:32 +#: bin/quilt.in:36 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "" -#: bin/quilt.in:33 +#: bin/quilt.in:37 msgid " quilt --version" msgstr "" -#: bin/quilt.in:35 +#: bin/quilt.in:39 msgid "Commands are:" msgstr "" -#: bin/quilt.in:40 +#: bin/quilt.in:44 msgid "" "\n" "Global options:\n" @@ -119,7 +119,7 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:583 msgid "Patch %s is currently applied\\n" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 msgid "Patch %s not applied before patch %s\\n" msgstr "" @@ -483,9 +483,9 @@ msgstr "" #: quilt/mail.in:24 msgid "" -"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--" -"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] " -"[--reply-to message] [first_patch [last_patch]]\\n" +"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " +"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" +"subject ...] [--reply-to message] [first_patch [last_patch]]\\n" msgstr "" #: quilt/mail.in:27 @@ -503,6 +503,9 @@ msgid "" "\tused, the editor will not be invoked, and the patches will be\n" "\tprocessed immediately.\n" "\n" +"-M file\n" +"\tLike the -m option, but read the introduction from file.\n" +"\n" "--prefix prefix\n" "\tUse an alternate prefix in the bracketed part of the subjects\n" "\tgenerated. Defaults to \\`patch'.\n" @@ -533,31 +536,31 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:285 +#: quilt/mail.in:302 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:425 +#: quilt/mail.in:446 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:449 +#: quilt/mail.in:470 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:458 +#: quilt/mail.in:479 msgid "File %s does not exist\\n" msgstr "" -#: quilt/mail.in:518 +#: quilt/mail.in:539 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:521 +#: quilt/mail.in:542 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:624 +#: quilt/mail.in:654 msgid "Introduction saved as %s\\n" msgstr "" @@ -569,7 +572,8 @@ msgstr "" msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" -"topmost patch.\n" +"topmost patch. The name can be prefixed with a sub-directory name, allowing\n" +"for grouping related patches together.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" @@ -584,20 +588,24 @@ msgid "" "in the directory tree.\n" msgstr "" -#: quilt/new.in:75 +#: quilt/new.in:76 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" -#: quilt/new.in:90 quilt/refresh.in:185 +#: quilt/new.in:89 +msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" +msgstr "" + +#: quilt/new.in:97 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "" -#: quilt/new.in:101 quilt/refresh.in:342 +#: quilt/new.in:108 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "" -#: quilt/new.in:104 +#: quilt/new.in:111 msgid "Patch %s is now on top\\n" msgstr "" @@ -653,11 +661,11 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 +#: quilt/pop.in:116 quilt/scripts/patchfns.in:904 msgid "Failed to patch temporary files\\n" msgstr "" @@ -681,7 +689,7 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 msgid "No patches applied\\n" msgstr "" @@ -941,45 +949,45 @@ msgstr "" msgid "Changes to %s in patch %s reverted\\n" msgstr "" -#: quilt/scripts/edmail.in:83 +#: quilt/scripts/edmail.in:96 #, perl-format msgid "Display name `%s' contains unpaired parentheses\n" msgstr "" -#: quilt/scripts/edmail.in:101 +#: quilt/scripts/edmail.in:114 #, perl-format msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 +#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 +#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:534 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:596 +#: quilt/scripts/patchfns.in:562 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:633 +#: quilt/scripts/patchfns.in:599 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:655 +#: quilt/scripts/patchfns.in:632 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:978 +#: quilt/scripts/patchfns.in:945 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 " @@ -987,7 +995,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1122 +#: quilt/scripts/patchfns.in:1089 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1079,11 +1087,11 @@ msgstr "" msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:189 +#: quilt/setup.in:195 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:192 +#: quilt/setup.in:198 msgid "Unpacking archive %s\\n" msgstr "" |