diff options
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 136 |
1 files changed, 85 insertions, 51 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 44d95c0..d907829 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -119,7 +119,7 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:603 msgid "Patch %s is currently applied\\n" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427 msgid "Patch %s not applied before patch %s\\n" msgstr "" @@ -540,35 +540,35 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:192 quilt/mail.in:200 +#: quilt/mail.in:204 quilt/mail.in:212 msgid "Introduction message already specified" msgstr "" -#: quilt/mail.in:305 +#: quilt/mail.in:310 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:450 +#: quilt/mail.in:455 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:474 +#: quilt/mail.in:479 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:483 +#: quilt/mail.in:488 msgid "File %s does not exist\\n" msgstr "" -#: quilt/mail.in:543 +#: quilt/mail.in:548 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:546 +#: quilt/mail.in:551 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:660 +#: quilt/mail.in:665 msgid "Introduction saved as %s\\n" msgstr "" @@ -647,7 +647,7 @@ msgid "" msgstr "" #: quilt/pop.in:22 -msgid "Usage: quilt pop [-afRqv] [num|patch]\\n" +msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "" #: quilt/pop.in:25 @@ -671,37 +671,44 @@ msgid "" "-q\tQuiet operation.\n" "\n" "-v\tVerbose operation.\n" +"\n" +"--refresh\n" +"\tAutomatically refresh every patch before it gets unapplied.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 +#: quilt/pop.in:103 quilt/scripts/patchfns.in:884 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:125 +#: quilt/pop.in:128 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:150 +#: quilt/pop.in:153 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:155 +#: quilt/pop.in:158 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:226 +#: quilt/pop.in:216 quilt/push.in:373 +msgid "Options %s and %s are mutually exclusive\\n" +msgstr "" + +#: quilt/pop.in:238 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:236 +#: quilt/pop.in:248 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 +#: quilt/pop.in:272 quilt/scripts/patchfns.in:512 msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:259 quilt/push.in:422 +#: quilt/pop.in:279 quilt/push.in:437 msgid "Now at patch %s\\n" msgstr "" @@ -719,7 +726,7 @@ msgstr "" #: quilt/push.in:24 msgid "" "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" -"color[=always|auto|never]] [num|patch]\\n" +"color[=always|auto|never]] [--refresh] [num|patch]\\n" msgstr "" #: quilt/push.in:27 @@ -736,8 +743,7 @@ msgid "" "\n" "-q\tQuiet operation.\n" "\n" -"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n" -"\tapply the patch interactively: the patch utility may ask questions.\n" +"-f\tForce apply, even if the patch has rejects.\n" "\n" "-v\tVerbose operation.\n" "\n" @@ -753,44 +759,51 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\n" +"--refresh\n" +"\tAutomatically refresh every patch after it was successfully applied.\n" msgstr "" -#: quilt/push.in:68 +#: quilt/push.in:70 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: quilt/push.in:181 +#: quilt/push.in:183 msgid "Applying patch %s\\n" msgstr "" -#: quilt/push.in:215 +#: quilt/push.in:217 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "" -#: quilt/push.in:219 +#: quilt/push.in:221 msgid "Patch %s appears to be empty; applied\\n" msgstr "" -#: quilt/push.in:223 +#: quilt/push.in:225 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:233 +#: quilt/push.in:235 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:236 +#: quilt/push.in:238 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:291 +#: quilt/push.in:293 msgid "Patch %s is already applied; check your series file\\n" msgstr "" -#: quilt/push.in:396 +#: quilt/push.in:405 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" +#: quilt/push.in:413 +msgid "No patch applied\\n" +msgstr "" + #: quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " @@ -976,35 +989,35 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 +#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 +#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 +#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:554 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:583 +#: quilt/scripts/patchfns.in:582 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:620 +#: quilt/scripts/patchfns.in:619 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:898 +#: quilt/scripts/patchfns.in:902 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/scripts/patchfns.in:941 +#: 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 " @@ -1012,12 +1025,22 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1094 +#: quilt/scripts/patchfns.in:1018 +msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:1138 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" msgstr "" +#: quilt/scripts/patchfns.in:1146 +msgid "" +"The series file no longer matches the applied patches. Please run 'quilt pop " +"-a'.\\n" +msgstr "" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1068,21 +1091,21 @@ msgid "" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: quilt/setup.in:35 quilt/setup.in:55 +#: quilt/setup.in:38 quilt/setup.in:58 msgid "Directory %s exists\\n" msgstr "" -#: quilt/setup.in:61 +#: quilt/setup.in:64 msgid "File %s exists\\n" msgstr "" -#: quilt/setup.in:102 +#: quilt/setup.in:264 msgid "" -"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " -"{specfile|seriesfile}\\n" +"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" +"slow|--fast] {specfile|seriesfile}\\n" msgstr "" -#: quilt/setup.in:105 +#: quilt/setup.in:267 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1096,25 +1119,36 @@ msgid "" "\n" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" +"\n" +"--slow\tUse the original, slow method to process the spec file. This is the\n" +"\tdefault for now, but that might change in the future. In this mode,\n" +"\trpmbuild generates a working tree in a temporary directory while all\n" +"\tits actions are recorded, and then everything is replayed from scratch\n" +"\tin the target directory.\n" +"\n" +"--fast\tUse an alternative, faster method to process the spec file. In this\n" +"\tmode, rpmbuild is told to generate a working tree directly in the\n" +"\ttarget directory. If the input is a series file, it is assumed that\n" +"\tall archives have been extracted manually beforehand.\n" msgstr "" -#: quilt/setup.in:176 +#: quilt/setup.in:371 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: quilt/setup.in:179 +#: quilt/setup.in:374 msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:428 quilt/setup.in:440 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:234 quilt/setup.in:246 +#: quilt/setup.in:431 quilt/setup.in:443 msgid "Unpacking archive %s\\n" msgstr "" -#: quilt/setup.in:255 +#: quilt/setup.in:453 msgid "Trying alternative patches and series names..." msgstr "" |