From 67b0df979f03d64ecdfa0d0224466c1541e9321c Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 19 Sep 2006 15:13:46 +0000 Subject: - quilt/scripts/patchfns.in: Drop support for "-pab" in series file, for it breaks compatibility with previous versions of quilt, and is inconsistent. - test/dir-a-b.test: Drop test case for "-pab" in series file. --- po/de.po | 32 ++++++++++++++++---------------- po/fr.po | 32 ++++++++++++++++---------------- po/ja.po | 32 ++++++++++++++++---------------- po/quilt.pot | 32 ++++++++++++++++---------------- 4 files changed, 64 insertions(+), 64 deletions(-) (limited to 'po') diff --git a/po/de.po b/po/de.po index eb892c6..96b92af 100644 --- a/po/de.po +++ b/po/de.po @@ -180,11 +180,11 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:475 +#: 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:573 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -338,7 +338,7 @@ msgstr "Konnte temporäre Dateien nicht patchen\\n" msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:378 quilt/refresh.in:184 +#: quilt/diff.in:378 quilt/refresh.in:188 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" @@ -949,7 +949,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:488 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -1171,35 +1171,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tEntferne Whitespace an Zeilenenden.\n" -#: quilt/refresh.in:155 +#: quilt/refresh.in:159 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:190 +#: quilt/refresh.in:194 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:196 +#: quilt/refresh.in:200 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:202 +#: quilt/refresh.in:206 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:279 +#: quilt/refresh.in:284 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:285 +#: quilt/refresh.in:290 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1292,23 +1292,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:524 +#: 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:552 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:589 +#: 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:611 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:871 +#: 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 " @@ -1321,7 +1321,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:956 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/fr.po b/po/fr.po index d465b3b..a076721 100644 --- a/po/fr.po +++ b/po/fr.po @@ -180,11 +180,11 @@ msgstr "" msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:475 +#: 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:573 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu\\n" @@ -340,7 +340,7 @@ msgstr "Impossible de patcher les fichiers temporaires\\n" msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: quilt/diff.in:378 quilt/refresh.in:184 +#: quilt/diff.in:378 quilt/refresh.in:188 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" @@ -961,7 +961,7 @@ msgstr "Le patch %s doit msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:488 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -1187,35 +1187,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces la fin des lignes.\n" -#: quilt/refresh.in:155 +#: quilt/refresh.in:159 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:190 +#: quilt/refresh.in:194 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:196 +#: quilt/refresh.in:200 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:202 +#: quilt/refresh.in:206 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: quilt/refresh.in:279 +#: quilt/refresh.in:284 msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchang\\n" -#: quilt/refresh.in:285 +#: quilt/refresh.in:290 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafrachi\\n" @@ -1307,23 +1307,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:524 +#: 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:552 +#: 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:589 +#: 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:611 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:871 +#: 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 " @@ -1335,7 +1335,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:956 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/ja.po b/po/ja.po index f419e03..dc0ee91 100644 --- a/po/ja.po +++ b/po/ja.po @@ -177,11 +177,11 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:475 +#: 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:573 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -329,7 +329,7 @@ msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:378 quilt/refresh.in:184 +#: quilt/diff.in:378 quilt/refresh.in:188 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" @@ -927,7 +927,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:488 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -1145,33 +1145,33 @@ msgstr "" "--strip-trailing-whitespace\n" "\t末尾の空白文字を削除する。\n" -#: quilt/refresh.in:155 +#: quilt/refresh.in:159 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: quilt/refresh.in:190 +#: quilt/refresh.in:194 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実" "行する場合は -f オプションを使用してください。\\n" -#: quilt/refresh.in:196 +#: quilt/refresh.in:200 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:202 +#: quilt/refresh.in:206 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:279 +#: quilt/refresh.in:284 msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:285 +#: quilt/refresh.in:290 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1262,24 +1262,24 @@ msgstr "ファイル %s が消えました!\n" msgid "Failed to rename %s to %s: %s\n" msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n" -#: quilt/scripts/patchfns.in:524 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:552 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:589 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:611 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:871 +#: 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 " @@ -1291,7 +1291,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:956 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 78b5337..342dde4 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -119,11 +119,11 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:475 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 msgid "No patches in series\\n" msgstr "" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:573 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 msgid "Patch %s is currently applied\\n" msgstr "" @@ -226,7 +226,7 @@ msgstr "" msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:378 quilt/refresh.in:184 +#: quilt/diff.in:378 quilt/refresh.in:188 msgid "Diff failed, aborting\\n" msgstr "" @@ -643,7 +643,7 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:488 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:474 msgid "No patches applied\\n" msgstr "" @@ -785,29 +785,29 @@ msgid "" "\tStrip trailing whitespace at the end of lines.\n" msgstr "" -#: quilt/refresh.in:155 +#: quilt/refresh.in:159 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/refresh.in:190 +#: quilt/refresh.in:194 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:196 +#: quilt/refresh.in:200 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:202 +#: quilt/refresh.in:206 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:279 +#: quilt/refresh.in:284 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:285 +#: quilt/refresh.in:290 msgid "Refreshed patch %s\\n" msgstr "" @@ -887,23 +887,23 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:524 +#: quilt/scripts/patchfns.in:510 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:552 +#: quilt/scripts/patchfns.in:538 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:589 +#: quilt/scripts/patchfns.in:575 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:611 +#: quilt/scripts/patchfns.in:597 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:871 +#: 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 " @@ -911,7 +911,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:956 +#: quilt/scripts/patchfns.in:942 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" -- cgit