diff options
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 117 |
1 files changed, 61 insertions, 56 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 940843b..ea1604c 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:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "" @@ -192,7 +192,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -284,7 +284,7 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "" @@ -620,18 +620,21 @@ msgid "" "the series file.\n" msgstr "" -#: quilt/patches.in:22 -msgid "Usage: quilt patches [-v] {file}\\n" +#: quilt/patches.in:24 +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "" -#: quilt/patches.in:25 +#: quilt/patches.in:27 msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" #: quilt/pop.in:22 @@ -661,39 +664,35 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:904 -msgid "Failed to patch temporary files\\n" -msgstr "" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "" @@ -710,8 +709,8 @@ msgstr "" #: quilt/push.in:24 msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color" -"[=always|auto|never]] [num|patch]\\n" +"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" +"color[=always|auto|never]] [num|patch]\\n" msgstr "" #: quilt/push.in:27 @@ -744,38 +743,38 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:231 +#: quilt/push.in:232 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:234 +#: quilt/push.in:235 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" @@ -856,7 +855,7 @@ msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:252 +#: quilt/refresh.in:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "" @@ -864,7 +863,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "" @@ -959,35 +958,39 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:632 +#: quilt/scripts/patchfns.in:638 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:951 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 " @@ -995,7 +998,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1006,33 +1009,32 @@ msgstr "" msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "" @@ -1046,24 +1048,27 @@ msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "" -#: quilt/setup.in:75 +#: quilt/setup.in:99 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" msgstr "" -#: quilt/setup.in:78 +#: quilt/setup.in:102 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1079,19 +1084,19 @@ msgid "" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" msgstr "" -#: quilt/setup.in:149 +#: quilt/setup.in:173 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: quilt/setup.in:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "" |