diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-06-18 18:03:57 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-06-18 18:03:57 +0000 |
| commit | 31a5851d6372712fa6bafd4a6081f21ecee1c570 (patch) | |
| tree | af8dbbacc1dfadd0423f1b443b93f037de2b0b9e /po/quilt.pot | |
| parent | 442b3debff33d2d0f13214abf42bd53525557ff9 (diff) | |
| download | quilt-31a5851d6372712fa6bafd4a6081f21ecee1c570.tar.gz | |
- Add fix for refresh --strip-trailing-whitespace option: now
refresh always checks for trailing whitespace and reports it
per file and line number. With --strip-trailing-whitespace it
strips the whitespace from the patch and from the affected files
in the working tree.
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 9b3df87..d221b81 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -669,19 +669,20 @@ msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:214 -msgid "Nothing in patch %s\\n" +#: ../quilt/refresh.in:213 +msgid "" +"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: ../quilt/refresh.in:228 -msgid "Warning: %s adds trailing whitespace\\n" +#: ../quilt/refresh.in:219 +msgid "Nothing in patch %s\\n" msgstr "" -#: ../quilt/refresh.in:290 +#: ../quilt/refresh.in:296 msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:295 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "" |