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/fr.po | |
| 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/fr.po')
| -rw-r--r-- | po/fr.po | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -915,19 +915,20 @@ msgstr "" "Des fichiers plus récents modifient les mêmes fichiers que %s.\n" "Forcez le rafraîchissement avec -f.\\n" -#: ../quilt/refresh.in:214 +#: ../quilt/refresh.in:213 +msgid "" +"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" +msgstr "" + +#: ../quilt/refresh.in:219 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: ../quilt/refresh.in:228 -msgid "Warning: %s adds trailing whitespace\\n" -msgstr "" - -#: ../quilt/refresh.in:290 +#: ../quilt/refresh.in:296 msgid "Patch %s is unchanged\\n" msgstr "Le patch %s n'a pas été modifié\\n" -#: ../quilt/refresh.in:295 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "Le patch %s a été rafraichi.\\n" |