diff options
-rw-r--r-- | po/de.po | 94 | ||||
-rw-r--r-- | po/fr.po | 94 | ||||
-rw-r--r-- | po/ja.po | 94 | ||||
-rw-r--r-- | po/quilt.pot | 92 | ||||
-rw-r--r-- | quilt.changes | 9 | ||||
-rw-r--r-- | quilt.quiltrc | 4 | ||||
-rw-r--r-- | quilt/diff.in | 13 | ||||
-rw-r--r-- | quilt/patches.in | 1 | ||||
-rw-r--r-- | quilt/refresh.in | 16 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 7 | ||||
-rw-r--r-- | test/formats.test | 13 |
11 files changed, 312 insertions, 125 deletions
@@ -177,11 +177,11 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:442 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -212,6 +212,7 @@ msgstr "" "[--sort] [--color] [datei ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -220,6 +221,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -301,40 +306,40 @@ msgstr "" "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n" "\tReihenfolge zu erhalten.\n" -#: quilt/diff.in:213 +#: quilt/diff.in:217 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: quilt/diff.in:225 +#: quilt/diff.in:231 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: quilt/diff.in:258 quilt/files.in:105 +#: quilt/diff.in:265 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:308 quilt/pop.in:98 +#: quilt/diff.in:315 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/diff.in:332 quilt/pop.in:122 +#: quilt/diff.in:339 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:358 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:371 quilt/refresh.in:177 +#: quilt/diff.in:378 quilt/refresh.in:184 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:378 +#: quilt/diff.in:385 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -941,7 +946,7 @@ msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:455 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -1070,6 +1075,7 @@ msgstr "" "whitespace] [patch]\\n" #: quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1086,6 +1092,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -1158,35 +1168,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tEntferne Whitespace an Zeilenenden.\n" -#: quilt/refresh.in:149 +#: quilt/refresh.in:155 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben\\n" -#: quilt/refresh.in:183 +#: quilt/refresh.in:190 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von %s. Auffrischen mit -f " "erzwingen.\\n" -#: quilt/refresh.in:189 +#: quilt/refresh.in:196 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien " "enthalten, die danach von anderen Patches weiter verändert werden.\\n" -#: quilt/refresh.in:195 +#: quilt/refresh.in:202 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:272 +#: quilt/refresh.in:279 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:277 +#: quilt/refresh.in:285 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1279,23 +1289,23 @@ msgstr "Datei %s ist verschwunden\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Konnte %s nicht auf %s umbenennen: %s\n" -#: quilt/scripts/patchfns.in:491 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:519 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:556 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: quilt/scripts/patchfns.in:578 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:833 +#: quilt/scripts/patchfns.in:857 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 " @@ -1308,7 +1318,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:918 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1322,36 +1332,62 @@ msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "Aufruf: %s [-p num] [-n] [patch]\n" #: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:92 quilt/scripts/remove-ws.in:88 +#: quilt/scripts/remove-ws.in:124 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s: Ich bin verwirrt.\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:116 quilt/scripts/remove-ws.in:169 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:120 quilt/scripts/remove-ws.in:180 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:123 quilt/scripts/remove-ws.in:183 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:143 quilt/scripts/remove-ws.in:203 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "Umbenennen von %s auf %s: %s\n" +#: quilt/scripts/remove-ws.in:45 +#, fuzzy, perl-format +msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n" +msgstr "Aufruf: %s [-p num] [-n] [patch]\n" + +#: quilt/scripts/remove-ws.in:159 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in line %s of %s\n" +msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n" + +#: quilt/scripts/remove-ws.in:162 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in lines %s of %s\n" +msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n" + +#: quilt/scripts/remove-ws.in:173 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in line %s of %s\n" +msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n" + +#: quilt/scripts/remove-ws.in:176 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in lines %s of %s\n" +msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n" + #: quilt/series.in:22 msgid "Usage: quilt series [-v]\\n" msgstr "Verwendung: quilt series [-v]\\n" @@ -177,11 +177,11 @@ msgstr "" msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:442 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 msgid "No patches in series\\n" msgstr "Aucun patch dans la srie\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu\\n" @@ -212,6 +212,7 @@ msgstr "" "sort] [--color] [fichier ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -220,6 +221,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -303,40 +308,40 @@ msgstr "" "--sort\tTrie les fichiers par leur nom au lieu de prserver leur ordre\n" "\td'origine.\n" -#: quilt/diff.in:213 +#: quilt/diff.in:217 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options --combine, --snapshot et -z ne peuvent pas tre combines." "\\n" -#: quilt/diff.in:225 +#: quilt/diff.in:231 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: quilt/diff.in:258 quilt/files.in:105 +#: quilt/diff.in:265 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: quilt/diff.in:308 quilt/pop.in:98 +#: quilt/diff.in:315 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: quilt/diff.in:332 quilt/pop.in:122 +#: quilt/diff.in:339 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:358 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: quilt/diff.in:371 quilt/refresh.in:177 +#: quilt/diff.in:378 quilt/refresh.in:184 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: quilt/diff.in:378 +#: quilt/diff.in:385 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Attention: un patch plus recent modifie des fichiers communs %s\\n" @@ -953,7 +958,7 @@ msgstr "Le patch %s doit tre rafraichi au pralable.\\n" msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:455 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -1090,6 +1095,7 @@ msgstr "" "[patch]\\n" #: quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1106,6 +1112,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -1174,35 +1184,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces la fin des lignes.\n" -#: quilt/refresh.in:149 +#: quilt/refresh.in:155 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de rafrachir des patchs avec -p%s. Veuillez spcifier -p0 ou -p1 " " la place.\\n" -#: quilt/refresh.in:183 +#: quilt/refresh.in:190 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Des fichiers plus rcents modifient les mmes fichiers que %s.\n" "Forcez le rafrachissement avec -f.\\n" -#: quilt/refresh.in:189 +#: quilt/refresh.in:196 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n" "certains fichiers sont masqus.\\n" -#: quilt/refresh.in:195 +#: quilt/refresh.in:202 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: quilt/refresh.in:272 +#: quilt/refresh.in:279 msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchang\\n" -#: quilt/refresh.in:277 +#: quilt/refresh.in:285 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafrachi\\n" @@ -1294,23 +1304,23 @@ msgstr "Le fichier %s a disparu !\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Impossible de renommer %s en %s : %s\n" -#: quilt/scripts/patchfns.in:491 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: quilt/scripts/patchfns.in:519 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: quilt/scripts/patchfns.in:556 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" -#: quilt/scripts/patchfns.in:578 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:833 +#: quilt/scripts/patchfns.in:857 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 " @@ -1322,7 +1332,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:918 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1336,36 +1346,62 @@ msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n" #: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:92 quilt/scripts/remove-ws.in:88 +#: quilt/scripts/remove-ws.in:124 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s : Je suis confus.\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "Attention : espaces la fin de la ligne %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:116 quilt/scripts/remove-ws.in:169 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "Attention : espaces la fin des lignes %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:120 quilt/scripts/remove-ws.in:180 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "Suppression des espaces la fin de la ligne %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:123 quilt/scripts/remove-ws.in:183 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "Suppression des espaces la fin des lignes %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:143 quilt/scripts/remove-ws.in:203 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "En renommant %s en %s : %s\n" +#: quilt/scripts/remove-ws.in:45 +#, fuzzy, perl-format +msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n" +msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n" + +#: quilt/scripts/remove-ws.in:159 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in line %s of %s\n" +msgstr "Attention : espaces la fin de la ligne %s de %s\n" + +#: quilt/scripts/remove-ws.in:162 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in lines %s of %s\n" +msgstr "Attention : espaces la fin des lignes %s de %s\n" + +#: quilt/scripts/remove-ws.in:173 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in line %s of %s\n" +msgstr "Attention : espaces la fin de la ligne %s de %s\n" + +#: quilt/scripts/remove-ws.in:176 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in lines %s of %s\n" +msgstr "Attention : espaces la fin des lignes %s de %s\n" + #: quilt/series.in:22 msgid "Usage: quilt series [-v]\\n" msgstr "Usage : quilt series [-v]\\n" @@ -174,11 +174,11 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:442 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -209,6 +209,7 @@ msgstr "" "sort] [--color] [ファイル ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -217,6 +218,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -295,37 +300,37 @@ msgstr "" "\n" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" -#: quilt/diff.in:213 +#: quilt/diff.in:217 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: quilt/diff.in:225 +#: quilt/diff.in:231 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:258 quilt/files.in:105 +#: quilt/diff.in:265 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:308 quilt/pop.in:98 +#: quilt/diff.in:315 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/diff.in:332 quilt/pop.in:122 +#: quilt/diff.in:339 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:358 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:371 quilt/refresh.in:177 +#: quilt/diff.in:378 quilt/refresh.in:184 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:378 +#: quilt/diff.in:385 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" @@ -919,7 +924,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:455 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -1051,6 +1056,7 @@ msgstr "" "[パッチ]\\n" #: quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1067,6 +1073,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -1132,33 +1142,33 @@ msgstr "" "--strip-trailing-whitespace\n" "\t末尾の空白文字を削除する。\n" -#: quilt/refresh.in:149 +#: quilt/refresh.in:155 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: quilt/refresh.in:183 +#: quilt/refresh.in:190 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実" "行する場合は -f オプションを使用してください。\\n" -#: quilt/refresh.in:189 +#: quilt/refresh.in:196 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:195 +#: quilt/refresh.in:202 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:272 +#: quilt/refresh.in:279 msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:277 +#: quilt/refresh.in:285 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1249,24 +1259,24 @@ msgstr "ファイル %s が消えました!\n" msgid "Failed to rename %s to %s: %s\n" msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n" -#: quilt/scripts/patchfns.in:491 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:519 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:556 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:578 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:833 +#: quilt/scripts/patchfns.in:857 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 " @@ -1278,7 +1288,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:918 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1292,36 +1302,62 @@ msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "書式: %s [p num] [-n] [パッチ]\n" #: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:92 quilt/scripts/remove-ws.in:88 +#: quilt/scripts/remove-ws.in:124 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s: 混乱しました\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:116 quilt/scripts/remove-ws.in:169 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:120 quilt/scripts/remove-ws.in:180 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:123 quilt/scripts/remove-ws.in:183 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:143 quilt/scripts/remove-ws.in:203 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "%s から %s へ名前を変更しました: %s\n" +#: quilt/scripts/remove-ws.in:45 +#, fuzzy, perl-format +msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n" +msgstr "書式: %s [p num] [-n] [パッチ]\n" + +#: quilt/scripts/remove-ws.in:159 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in line %s of %s\n" +msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" + +#: quilt/scripts/remove-ws.in:162 +#, fuzzy, perl-format +msgid "Warning: spaces used for indentation in lines %s of %s\n" +msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" + +#: quilt/scripts/remove-ws.in:173 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in line %s of %s\n" +msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" + +#: quilt/scripts/remove-ws.in:176 +#, fuzzy, perl-format +msgid "Warning: converting space indentation to tabs in lines %s of %s\n" +msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" + #: quilt/series.in:22 msgid "Usage: quilt series [-v]\\n" msgstr "使い方: quilt series [-v]\\n" diff --git a/po/quilt.pot b/po/quilt.pot index ecf33ac..2964f73 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -117,11 +117,11 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:442 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 msgid "No patches in series\\n" msgstr "" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "" @@ -157,6 +157,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -195,36 +199,36 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: quilt/diff.in:213 +#: quilt/diff.in:217 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: quilt/diff.in:225 +#: quilt/diff.in:231 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/diff.in:258 quilt/files.in:105 +#: quilt/diff.in:265 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:308 quilt/pop.in:98 +#: quilt/diff.in:315 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:332 quilt/pop.in:122 +#: quilt/diff.in:339 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/diff.in:351 +#: quilt/diff.in:358 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:371 quilt/refresh.in:177 +#: quilt/diff.in:378 quilt/refresh.in:184 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:378 +#: quilt/diff.in:385 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" @@ -637,7 +641,7 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:455 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "" @@ -749,6 +753,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -775,29 +783,29 @@ msgid "" "\tStrip trailing whitespace at the end of lines.\n" msgstr "" -#: quilt/refresh.in:149 +#: quilt/refresh.in:155 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/refresh.in:183 +#: quilt/refresh.in:190 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:189 +#: quilt/refresh.in:196 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:195 +#: quilt/refresh.in:202 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:272 +#: quilt/refresh.in:279 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:277 +#: quilt/refresh.in:285 msgid "Refreshed patch %s\\n" msgstr "" @@ -877,23 +885,23 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:491 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:519 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:556 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:578 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:833 +#: quilt/scripts/patchfns.in:857 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 " @@ -901,7 +909,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:918 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -913,36 +921,62 @@ 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:92 quilt/scripts/remove-ws.in:88 +#: quilt/scripts/remove-ws.in:124 #, perl-format msgid "%s: I'm confused.\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166 #, 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:116 quilt/scripts/remove-ws.in:169 #, 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:120 quilt/scripts/remove-ws.in:180 #, 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:123 quilt/scripts/remove-ws.in:183 #, 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:143 quilt/scripts/remove-ws.in:203 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "" +#: quilt/scripts/remove-ws.in:45 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n" +msgstr "" + +#: quilt/scripts/remove-ws.in:159 +#, perl-format +msgid "Warning: spaces used for indentation in line %s of %s\n" +msgstr "" + +#: quilt/scripts/remove-ws.in:162 +#, perl-format +msgid "Warning: spaces used for indentation in lines %s of %s\n" +msgstr "" + +#: quilt/scripts/remove-ws.in:173 +#, perl-format +msgid "Warning: converting space indentation to tabs in line %s of %s\n" +msgstr "" + +#: quilt/scripts/remove-ws.in:176 +#, perl-format +msgid "Warning: converting space indentation to tabs in lines %s of %s\n" +msgstr "" + #: quilt/series.in:22 msgid "Usage: quilt series [-v]\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 98da886..ece527e 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jun 12 17:22:42 CEST 2006 - agruen@suse.de + +- quilt/diff.in, quilt/refresh.in: Add `-p ab' options which + produce a/file and b/file filenams in headers instead of + dir.orig/file and dir/file, similar to BK, git, hg patches. +- Only touch .pc/$patch/.timestamp when a path actually is being + refreshed. + +------------------------------------------------------------------- Fri Jun 2 11:52:11 CEST 2006 - khali@linux-fr.org - doc/quilt.1.in: Mention the QUILT_PATCHES_PREFIX, diff --git a/quilt.quiltrc b/quilt.quiltrc index 5855b88..e89039a 100644 --- a/quilt.quiltrc +++ b/quilt.quiltrc @@ -12,6 +12,10 @@ QUILT_PUSH_ARGS="--color=auto" QUILT_DIFF_ARGS="--no-timestamps --color=auto" QUILT_REFRESH_ARGS="--no-timestamps --backup" +# (Add "-p ab" to QUILT_DIFF_ARGS and QUILT_REFRESH_ARGS to get +# -p1 style diffs with a/file and b/file filenams in headers +# instead of dir.orig/file and dir/file.) + # The directory in which patches are found (defaults to "patches"). #QUILT_PATCHES=patches diff --git a/quilt/diff.in b/quilt/diff.in index 25de4fb..dad2da0 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -32,6 +32,10 @@ included. -p n Create a -p n style patch (-p0 or -p1 are supported). +-p ab Create a -p1 style patch, but use a/file and b/file as the + original and new filenames instead of the default + dir.orig/file and dir/file names. + -u, -U num, -c, -C num Create a unified diff (-u, -U) with num lines of context. Create a context diff (-c, -C) with num lines of context. The number of @@ -220,12 +224,15 @@ if [ -z "$opt_strip_level" ] then opt_strip_level=$(patch_strip_level $last_patch) fi -if [ "$opt_strip_level" != 0 -a "$opt_strip_level" != 1 ] -then +case "$opt_strip_level" in +0 | 1 | ab) + ;; +*) printf $"Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n" \ "$opt_strip_level" >&2 die 1 -fi + ;; +esac trap "die 1" SIGTERM diff --git a/quilt/patches.in b/quilt/patches.in index d5b15f7..3172a16 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -53,6 +53,7 @@ scan_applied() touched_by_patch() { local strip=$1 patch=$2 + [ $strip = ab ] && strip=1 cat_file $(patch_file_name $patch) \ | awk ' /^\+\+\+[ \t]/ { diff --git a/quilt/refresh.in b/quilt/refresh.in index 7754290..f1fcd03 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -38,6 +38,10 @@ patch. -p n Create a -p n style patch (-p0 or -p1 supported). +-p ab Create a -p1 style patch, but use a/file and b/file as the + original and new filenames instead of the default + dir.orig/file and dir/file names. + -u, -U num, -c, -C num Create a unified diff (-u, -U) with num lines of context. Create a context diff (-c, -C) with num lines of context. The number of @@ -144,11 +148,14 @@ if [ -z "$opt_strip_level" ] then opt_strip_level=$(patch_strip_level $patch) fi -if [ $opt_strip_level -gt 1 ] -then +case "$opt_strip_level" in +0 | 1 | ab) + ;; +*) printf $"Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\n" "$opt_strip_level\n" >&2 exit 1 -fi + ;; +esac trap "die 1" SIGTERM @@ -274,13 +281,12 @@ elif ( [ -z "$QUILT_BACKUP" -o ! -e $patch_file ] || \ mv $patch_file $patch_file~ ) && \ cat_to_new_file $patch_file < $tmp_result then + touch $QUILT_PC/$patch/.timestamp printf $"Refreshed patch %s\n" "$(print_patch $patch)" else die 1 fi -touch $QUILT_PC/$patch/.timestamp - rm -f $QUILT_PC/$patch~refresh if ! change_db_strip_level -p$opt_strip_level $patch then diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index fa591c1..394d26b 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -629,6 +629,7 @@ filenames_in_patch() if [ -e "$patch_file" ] then local strip=$(patch_strip_level $patch) + [ "$strip" = ab ] && strip=1 awk ' ($1 == "+++" || $1 == "---" || $1 == "***") && \ $3 != "----" && $3 != "****" \ @@ -670,7 +671,11 @@ diff_file() local index old_hdr old_date new_hdr new_date line : ${opt_strip_level:=1} - if [ $opt_strip_level -eq 0 ] + if [ $opt_strip_level = ab ] + then + old_hdr=a/$file + new_hdr=b/$file + elif [ $opt_strip_level -eq 0 ] then old_hdr=$file.orig new_hdr=$file diff --git a/test/formats.test b/test/formats.test index a30ac45..8fcb53c 100644 --- a/test/formats.test +++ b/test/formats.test @@ -104,5 +104,18 @@ > ! new > 4 + $ quilt diff -p ab + > Index: b/test.txt + > =================================================================== + > --- a/test.txt + > +++ b/test.txt + > @@ -1,5 +1,5 @@ + > 1 + > 2 + > -old + > +new + > 4 + > 5 + $ cd .. $ rm -rf d |