diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-09-04 12:12:02 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-09-04 12:12:02 +0000 |
| commit | be57f6248ee08bd3f49b5e44ad34989566400f0a (patch) | |
| tree | e622e5394e6676dcd9902b5ea16406db0335f7a8 /po | |
| parent | 03604fffac0b6c5c01d504d1273e7fc2d9a4aac8 (diff) | |
| download | quilt-be57f6248ee08bd3f49b5e44ad34989566400f0a.tar.gz | |
- quilt/diff.in: Fix incorrect error message when incompatible options
are used. Fix direct call to awk.
Diffstat (limited to 'po')
| -rw-r--r-- | po/de.po | 5 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/ja.po | 5 | ||||
| -rw-r--r-- | po/quilt.pot | 3 |
4 files changed, 12 insertions, 7 deletions
@@ -310,9 +310,10 @@ msgstr "" "\tReihenfolge zu erhalten.\n" #: quilt/diff.in:231 -msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +msgid "" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -"Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " +"Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" #: quilt/diff.in:258 @@ -312,9 +312,11 @@ msgstr "" "\td'origine.\n" #: quilt/diff.in:231 -msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +msgid "" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -"Les options -c patch, --snapshot et -z ne peuvent pas tre combines." +"Les options --combine, --snapshot et -z ne peuvent pas tre combines." +"\\n" #: quilt/diff.in:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" @@ -305,9 +305,10 @@ msgstr "" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" #: quilt/diff.in:231 -msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +msgid "" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -"オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" +"オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" #: quilt/diff.in:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 95e8797..4a7fc1f 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -212,7 +212,8 @@ msgid "" msgstr "" #: quilt/diff.in:231 -msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +msgid "" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" #: quilt/diff.in:258 |